diff --git a/res/include/script/dependencies/util.js b/res/include/script/dependencies/util.js
index 9beb7f3..c463b76 100644
--- a/res/include/script/dependencies/util.js
+++ b/res/include/script/dependencies/util.js
@@ -91,7 +91,7 @@ function domainURL() {
 	return url;
 }
 
-function formatDataVolume(amt = 0, precision = 3) {
+function formatDataVolume(amt, precision) {
 	if (precision < 3) { precision = 3; }
 	if (amt >= 1e12) {
 		return (amt/1e12).toPrecision(precision) + " TB";
diff --git a/res/include/script/file_viewer/DetailsWindow.js b/res/include/script/file_viewer/DetailsWindow.js
index a412f41..df8a5c9 100644
--- a/res/include/script/file_viewer/DetailsWindow.js
+++ b/res/include/script/file_viewer/DetailsWindow.js
@@ -1,17 +1,9 @@
 class DetailsWindow {
-	viewer         = null;
-
-	visible        = false;
-	fileID         = "";
-	graph          = 0;
-
-	divPopup        = null;
-	btnDetails      = null;
-	btnCloseDetails = null;
-	divFileDetails  = null;
-
 	constructor(viewer) {let dw = this;
-		dw.viewer = viewer;
+		dw.viewer  = viewer;
+		dw.visible = false;
+		dw.fileID  = "";
+		dw.graph   = 0;
 
 		dw.divPopup        = document.getElementById("details_popup");
 		dw.btnDetails      = document.getElementById("btn_details");
diff --git a/res/include/script/file_viewer/ListNavigator.js b/res/include/script/file_viewer/ListNavigator.js
index c64c4d1..bc17efe 100644
--- a/res/include/script/file_viewer/ListNavigator.js
+++ b/res/include/script/file_viewer/ListNavigator.js
@@ -1,19 +1,11 @@
 class ListNavigator {
-	viewer   = null;
-	length   = 0;
-	position = 0;
-	data     = [];
-	history  = [];
-	shuffle  = false;
-
-	divListNavigator = null;
-	btnDownloadList  = null;
-	btnShuffle       = null;
-
 	constructor(viewer, data){let ln = this;
-		ln.viewer = viewer;
-		ln.data   = data;
-		ln.length = data.length;
+		ln.viewer   = viewer;
+		ln.data     = data;
+		ln.length   = data.length;
+		ln.position = 0;
+		ln.history  = [];
+		ln.shuffle  = false;
 
 		ln.divListNavigator = document.getElementById("list_navigator");
 
diff --git a/res/include/script/file_viewer/Toolbar.js b/res/include/script/file_viewer/Toolbar.js
index 0fd88b9..9223a38 100644
--- a/res/include/script/file_viewer/Toolbar.js
+++ b/res/include/script/file_viewer/Toolbar.js
@@ -1,27 +1,8 @@
 class Toolbar {
-	viewer = null;
-
-	visible = false;
-	sharebarVisible = false;
-
-	// Elements
-	divToolbar       = null;
-	divFilePreview   = null;
-	downloadFrame    = null;
-
-	spanViews        = null;
-	spanDownloads    = null;
-	spanSize         = null;
-
-	btnToggleToolbar = null;
-	btnDownload      = null;
-	btnCopyLink      = null;
-	spanCopyLink     = null;
-	btnShare         = null;
-	divSharebar      = null;
-
 	constructor(viewer) {let t = this;
-		this.viewer = viewer;
+		t.viewer = viewer;
+		t.visible = false;
+		t.sharebarVisible = false;
 
 		t.divToolbar       = document.getElementById("toolbar");
 		t.divFilePreview   = document.getElementById("filepreview");
diff --git a/res/include/script/file_viewer/Viewer.js b/res/include/script/file_viewer/Viewer.js
index d8da829..6b20f41 100644
--- a/res/include/script/file_viewer/Viewer.js
+++ b/res/include/script/file_viewer/Viewer.js
@@ -1,23 +1,17 @@
 class Viewer {
-	// Child components
-	toolbar       = null;
-	listNavigator = null;
-	detailsWindow = null;
-
-	divFilepreview = null;
-
-	currentFile = "";
-	title       = ""; // Contains either the file name or list title
-	listId      = "";
-	viewToken   = "";
-	isList      = false;
-	isFile      = false;
-	initialized = false;
-
 	constructor(type, viewToken, data) {let v = this;
-		if (v.initialized) {
-			return;
-		}
+		// Set defaults
+		v.toolbar       = null;
+		v.listNavigator = null;
+		v.detailsWindow = null;
+		v.divFilepreview = null;
+		v.currentFile = "";
+		v.title       = ""; // Contains either the file name or list title
+		v.listId      = "";
+		v.viewToken   = "";
+		v.isList      = false;
+		v.isFile      = false;
+		v.initialized = false;
 
 		v.viewToken     = viewToken;
 		v.toolbar       = new Toolbar(v);
@@ -37,7 +31,6 @@ class Viewer {
 			document.getElementById("button_close_file_viewer").remove()
 		}
 
-
 		if (type === "file") {
 			v.isFile = true;
 			v.currentFile = data.id;
diff --git a/res/include/script/file_viewer/viewer_scripts/AudioViewer.js b/res/include/script/file_viewer/viewer_scripts/AudioViewer.js
index 9b3d26f..371e74f 100644
--- a/res/include/script/file_viewer/viewer_scripts/AudioViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/AudioViewer.js
@@ -1,13 +1,4 @@
 class AudioViewer {
-	viewer = null;
-	file   = null;
-	next   = null;
-
-	container = null;
-	icon      = null;
-	element   = null;
-	source    = null;
-
 	constructor(viewer, file, next) {let v = this;
 		v.viewer = viewer;
 		v.file   = file;
diff --git a/res/include/script/file_viewer/viewer_scripts/FileViewer.js b/res/include/script/file_viewer/viewer_scripts/FileViewer.js
index c4b316a..46b22d9 100644
--- a/res/include/script/file_viewer/viewer_scripts/FileViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/FileViewer.js
@@ -1,10 +1,4 @@
 class FileViewer {
-	viewer = null;
-	file   = null;
-
-	container = null;
-	icon      = null;
-
 	constructor(viewer, file, next) {let v = this;
 		v.viewer = viewer;
 		v.file   = file;
diff --git a/res/include/script/file_viewer/viewer_scripts/ImageViewer.js b/res/include/script/file_viewer/viewer_scripts/ImageViewer.js
index 6282834..72f3893 100644
--- a/res/include/script/file_viewer/viewer_scripts/ImageViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/ImageViewer.js
@@ -1,18 +1,11 @@
 class ImageViewer {
-	viewer = null;
-	file   = null;
-
-	container = null;
-	element   = null;
-
-	zoomed = false;
-	x = 0;
-	y = 0;
-	dragging = false;
-
 	constructor(viewer, file) {let v = this;
-		v.viewer = viewer;
-		v.file   = file;
+		v.viewer   = viewer;
+		v.file     = file;
+		v.zoomed   = false;
+		v.x        = 0;
+		v.y        = 0;
+		v.dragging = false;
 
 		v.container = document.createElement("dv");
 		v.container.classList = "image-container";
diff --git a/res/include/script/file_viewer/viewer_scripts/PDFViewer.js b/res/include/script/file_viewer/viewer_scripts/PDFViewer.js
index 84bdf16..3fda0e0 100644
--- a/res/include/script/file_viewer/viewer_scripts/PDFViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/PDFViewer.js
@@ -1,8 +1,4 @@
 class PDFViewer {
-	viewer = null;
-	file   = null;
-	container = null;
-
 	constructor(viewer, file) {let v = this;
 		v.viewer = viewer;
 		v.file   = file;
diff --git a/res/include/script/file_viewer/viewer_scripts/TextViewer.js b/res/include/script/file_viewer/viewer_scripts/TextViewer.js
index c8acb04..f1d18f7 100644
--- a/res/include/script/file_viewer/viewer_scripts/TextViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/TextViewer.js
@@ -1,14 +1,9 @@
 class TextViewer {
-	viewer = null;
-	file   = null;
-
-	container = null;
-	pre       = null;
-	prettyprint = null;
-
 	constructor(viewer, file) {let v = this;
-		v.viewer = viewer;
-		v.file   = file;
+		v.viewer      = viewer;
+		v.file        = file;
+		v.pre         = null;
+		v.prettyprint = null;
 
 		v.container = document.createElement("div");
 		v.container.classList = "text-container";
diff --git a/res/include/script/file_viewer/viewer_scripts/VideoViewer.js b/res/include/script/file_viewer/viewer_scripts/VideoViewer.js
index 5476a83..6ef4c28 100644
--- a/res/include/script/file_viewer/viewer_scripts/VideoViewer.js
+++ b/res/include/script/file_viewer/viewer_scripts/VideoViewer.js
@@ -1,12 +1,4 @@
 class VideoViewer {
-	viewer = null;
-	file   = null;
-	next   = null;
-
-	vidContainer = null;
-	vidElement   = null;
-	videoSource  = null;
-
 	constructor(viewer, file, next) {let v = this;
 		v.viewer = viewer;
 		v.file   = file;