diff --git a/src/webui/www/eslint.config.mjs b/src/webui/www/eslint.config.mjs
index e23d11b87..520c4e3e6 100644
--- a/src/webui/www/eslint.config.mjs
+++ b/src/webui/www/eslint.config.mjs
@@ -26,6 +26,7 @@ export default [
             Stylistic
         },
         rules: {
+            "curly": ["error", "multi-or-nest", "consistent"],
             "eqeqeq": "error",
             "guard-for-in": "error",
             "no-undef": "off",
diff --git a/src/webui/www/private/rename_feed.html b/src/webui/www/private/rename_feed.html
index 5ca63f70b..4002286d7 100644
--- a/src/webui/www/private/rename_feed.html
+++ b/src/webui/www/private/rename_feed.html
@@ -63,9 +63,8 @@
                         window.parent.qBittorrent.Client.closeWindows();
                     },
                     onFailure: (response) => {
-                        if (response.status === 409) {
+                        if (response.status === 409)
                             alert(response.responseText);
-                        }
                         $("renameButton").disabled = false;
                     }
                 }).send();
diff --git a/src/webui/www/private/rename_files.html b/src/webui/www/private/rename_files.html
index 6371245fa..86ecc6712 100644
--- a/src/webui/www/private/rename_files.html
+++ b/src/webui/www/private/rename_files.html
@@ -14,9 +14,8 @@
     <script>
         "use strict";
 
-        if (window.parent.qBittorrent !== undefined) {
+        if (window.parent.qBittorrent !== undefined)
             window.qBittorrent = window.parent.qBittorrent;
-        }
         window.qBittorrent = window.parent.qBittorrent;
 
         const TriState = window.qBittorrent.FileTree.TriState;
@@ -51,9 +50,8 @@
         const tableHeaders = $$("#bulkRenameFilesTableFixedHeaderDiv .dynamicTableHeader th");
         let checkboxHeader;
         if (tableHeaders.length > 0) {
-            if (checkboxHeader) {
+            if (checkboxHeader)
                 checkboxHeader.remove();
-            }
             checkboxHeader = new Element("input");
             checkboxHeader.set("type", "checkbox");
             checkboxHeader.set("id", "rootMultiRename_cb");
@@ -218,9 +216,12 @@
         });
         $("file_counter").addEvent("input", (e) => {
             let value = e.target.valueAsNumber;
-            if (!value) { value = 0; }
-            if (value < 0) { value = 0; }
-            if (value > 99999999) { value = 99999999; }
+            if (!value)
+                value = 0;
+            if (value < 0)
+                value = 0;
+            if (value > 99999999)
+                value = 99999999;
             fileRenamer.fileEnumerationStart = value;
             $("file_counter").set("value", value);
             LocalPreferences.set("multirename_fileEnumerationStart", value);
@@ -265,9 +266,8 @@
 
             // Recreate table
             let selectedRows = bulkRenameFilesTable.getSelectedRows().map(row => row.rowId.toString());
-            for (const renamedRow of rows) {
+            for (const renamedRow of rows)
                 selectedRows = selectedRows.filter(selectedRow => selectedRow !== renamedRow.rowId.toString());
-            }
             bulkRenameFilesTable.clear();
 
             // Adjust file enumeration count by 1 when replacing single files to prevent naming conflicts
@@ -278,22 +278,18 @@
             setupTable(selectedRows);
         };
         fileRenamer.onRenameError = function(err, row) {
-            if (err.xhr.status === 409) {
+            if (err.xhr.status === 409)
                 $("rename_error").set("text", `QBT_TR(Rename failed: file or folder already exists)QBT_TR[CONTEXT=PropertiesWidget] \`${row.renamed}\``);
-            }
         };
         $("renameOptions").addEvent("change", (e) => {
             const combobox = e.target;
             const replaceOperation = combobox.value;
-            if (replaceOperation === "Replace") {
+            if (replaceOperation === "Replace")
                 fileRenamer.replaceAll = false;
-            }
-            else if (replaceOperation === "Replace All") {
+            else if (replaceOperation === "Replace All")
                 fileRenamer.replaceAll = true;
-            }
-            else {
+            else
                 fileRenamer.replaceAll = false;
-            }
             LocalPreferences.set("multirename_replaceAll", fileRenamer.replaceAll);
             $("renameButton").set("value", replaceOperation);
         });
@@ -336,9 +332,8 @@
                 pathItems.pop(); // remove last item (i.e. file name)
                 let parent = rootNode;
                 pathItems.forEach((folderName) => {
-                    if (folderName === ".unwanted") {
+                    if (folderName === ".unwanted")
                         return;
-                    }
 
                     let folderNode = null;
                     if (parent.children !== null) {
@@ -387,9 +382,9 @@
             bulkRenameFilesTable.updateTable(false);
             bulkRenameFilesTable.altRow();
 
-            if (selectedRows !== undefined) {
+            if (selectedRows !== undefined)
                 bulkRenameFilesTable.reselectRows(selectedRows);
-            }
+
             fileRenamer.selectedFiles = bulkRenameFilesTable.getSelectedRows();
             fileRenamer.update();
         };
@@ -400,12 +395,10 @@
                 noCache: true,
                 method: "get",
                 onSuccess: function(files) {
-                    if (files.length === 0) {
+                    if (files.length === 0)
                         bulkRenameFilesTable.clear();
-                    }
-                    else {
+                    else
                         handleTorrentFiles(files, selectedRows);
-                    }
                 }
             }).send();
         };
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index 54c6eb41e..57bffeb47 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -25,9 +25,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.Client = (() => {
     const exports = () => {
@@ -519,9 +518,8 @@ window.addEventListener("DOMContentLoaded", () => {
 
             if (useSubcategories) {
                 for (let j = (i + 1);
-                    ((j < sortedCategories.length) && sortedCategories[j].categoryName.startsWith(categoryName + "/")); ++j) {
+                    ((j < sortedCategories.length) && sortedCategories[j].categoryName.startsWith(categoryName + "/")); ++j)
                     categoryCount += sortedCategories[j].categoryCount;
-                }
             }
 
             categoryList.appendChild(create_link(categoryHash, categoryName, categoryCount));
@@ -600,9 +598,8 @@ window.addEventListener("DOMContentLoaded", () => {
         // We want the hostname.
         // If failed to parse the domain, original input should be returned
 
-        if (!/^(?:https?|udp):/i.test(url)) {
+        if (!/^(?:https?|udp):/i.test(url))
             return url;
-        }
 
         try {
             // hack: URL can not get hostname from udp protocol
@@ -610,9 +607,8 @@ window.addEventListener("DOMContentLoaded", () => {
             // host: "example.com:8443"
             // hostname: "example.com"
             const host = parsedUrl.hostname;
-            if (!host) {
+            if (!host)
                 return url;
-            }
 
             return host;
         }
@@ -654,9 +650,8 @@ window.addEventListener("DOMContentLoaded", () => {
         trackerList.forEach(({ host, trackerTorrentMap }, hash) => {
             const uniqueTorrents = new Set();
             for (const torrents of trackerTorrentMap.values()) {
-                for (const torrent of torrents) {
+                for (const torrent of torrents)
                     uniqueTorrents.add(torrent);
-                }
             }
 
             sortedList.push({
@@ -745,9 +740,8 @@ window.addEventListener("DOMContentLoaded", () => {
                         category_list.clear();
                         tagList.clear();
                     }
-                    if (response["rid"]) {
+                    if (response["rid"])
                         syncMainDataLastResponseId = response["rid"];
-                    }
                     if (response["categories"]) {
                         for (const key in response["categories"]) {
                             if (!Object.hasOwn(response["categories"], key))
@@ -816,9 +810,8 @@ window.addEventListener("DOMContentLoaded", () => {
                             const tracker = response["trackers_removed"][i];
                             const hash = window.qBittorrent.Client.genHash(getHost(tracker));
                             const trackerListEntry = trackerList.get(hash);
-                            if (trackerListEntry) {
+                            if (trackerListEntry)
                                 trackerListEntry.trackerTorrentMap.delete(tracker);
-                            }
                         }
                         updateTrackers = true;
                     }
@@ -844,7 +837,7 @@ window.addEventListener("DOMContentLoaded", () => {
                         if (updateTorrentList)
                             setupCopyEventHandler();
                     }
-                    if (response["torrents_removed"])
+                    if (response["torrents_removed"]) {
                         response["torrents_removed"].each((hash) => {
                             torrentsTable.removeRow(hash);
                             removeTorrentFromCategoryList(hash);
@@ -852,6 +845,7 @@ window.addEventListener("DOMContentLoaded", () => {
                             removeTorrentFromTagList(hash);
                             updateTags = true; // Always to update All tag
                         });
+                    }
                     torrentsTable.updateTable(full_update);
                     torrentsTable.altRow();
                     if (response["server_state"]) {
diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js
index 6b26b9289..8d37c6cc2 100644
--- a/src/webui/www/private/scripts/contextmenu.js
+++ b/src/webui/www/private/scripts/contextmenu.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.ContextMenu = (function() {
     const exports = function() {
@@ -82,12 +81,10 @@ window.qBittorrent.ContextMenu = (function() {
                 property: "opacity",
                 duration: this.options.fadeSpeed,
                 onComplete: function() {
-                    if (this.getStyle("opacity")) {
+                    if (this.getStyle("opacity"))
                         this.setStyle("visibility", "visible");
-                    }
-                    else {
+                    else
                         this.setStyle("visibility", "hidden");
-                    }
                 }.bind(this.menu)
             });
 
@@ -182,9 +179,8 @@ window.qBittorrent.ContextMenu = (function() {
                 this.touchStartEvent = null;
 
                 const isTargetUnchanged = (Math.abs(e.event.pageX - touchStartEvent.event.pageX) <= 10) && (Math.abs(e.event.pageY - touchStartEvent.event.pageY) <= 10);
-                if (((now - touchStartAt) >= this.options.touchTimer) && isTargetUnchanged) {
+                if (((now - touchStartAt) >= this.options.touchTimer) && isTargetUnchanged)
                     this.triggerMenu(touchStartEvent, elem);
-                }
             });
         },
 
@@ -202,9 +198,8 @@ window.qBittorrent.ContextMenu = (function() {
                 return;
 
             //prevent default, if told to
-            if (this.options.stopEvent) {
+            if (this.options.stopEvent)
                 e.stop();
-            }
             //record this as the trigger
             this.options.element = $(el);
             this.adjustMenuPosition(e);
@@ -294,9 +289,8 @@ window.qBittorrent.ContextMenu = (function() {
 
         //execute an action
         execute: function(action, element) {
-            if (this.options.actions[action]) {
+            if (this.options.actions[action])
                 this.options.actions[action](element, this, action);
-            }
             return this;
         }
     });
@@ -515,12 +509,10 @@ window.qBittorrent.ContextMenu = (function() {
             if ((id !== CATEGORIES_ALL) && (id !== CATEGORIES_UNCATEGORIZED)) {
                 this.showItem("editCategory");
                 this.showItem("deleteCategory");
-                if (useSubcategories) {
+                if (useSubcategories)
                     this.showItem("createSubcategory");
-                }
-                else {
+                else
                     this.hideItem("createSubcategory");
-                }
             }
             else {
                 this.hideItem("editCategory");
@@ -547,9 +539,10 @@ window.qBittorrent.ContextMenu = (function() {
         updateMenuItems: function() {
             const enabledColumnIndex = function(text) {
                 const columns = $("searchPluginsTableFixedHeaderRow").getChildren("th");
-                for (let i = 0; i < columns.length; ++i)
+                for (let i = 0; i < columns.length; ++i) {
                     if (columns[i].get("html") === "Enabled")
                         return i;
+                }
             };
 
             this.showItem("Enabled");
diff --git a/src/webui/www/private/scripts/download.js b/src/webui/www/private/scripts/download.js
index ce1df5c70..7279fd19e 100644
--- a/src/webui/www/private/scripts/download.js
+++ b/src/webui/www/private/scripts/download.js
@@ -23,9 +23,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.Download = (function() {
     const exports = function() {
@@ -77,25 +76,19 @@ window.qBittorrent.Download = (function() {
             $("autoTMM").selectedIndex = 0;
         }
 
-        if (pref.torrent_stop_condition === "MetadataReceived") {
+        if (pref.torrent_stop_condition === "MetadataReceived")
             $("stopCondition").selectedIndex = 1;
-        }
-        else if (pref.torrent_stop_condition === "FilesChecked") {
+        else if (pref.torrent_stop_condition === "FilesChecked")
             $("stopCondition").selectedIndex = 2;
-        }
-        else {
+        else
             $("stopCondition").selectedIndex = 0;
-        }
 
-        if (pref.torrent_content_layout === "Subfolder") {
+        if (pref.torrent_content_layout === "Subfolder")
             $("contentLayout").selectedIndex = 1;
-        }
-        else if (pref.torrent_content_layout === "NoSubfolder") {
+        else if (pref.torrent_content_layout === "NoSubfolder")
             $("contentLayout").selectedIndex = 2;
-        }
-        else {
+        else
             $("contentLayout").selectedIndex = 0;
-        }
     };
 
     const changeCategorySelect = function(item) {
diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js
index 079be9f76..58318f206 100644
--- a/src/webui/www/private/scripts/dynamicTable.js
+++ b/src/webui/www/private/scripts/dynamicTable.js
@@ -33,9 +33,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.DynamicTable = (function() {
     const exports = function() {
@@ -131,9 +130,8 @@ window.qBittorrent.DynamicTable = (function() {
                     const tableDiv = $(this.dynamicTableDivId);
 
                     // dynamicTableDivId is not visible on the UI
-                    if (!tableDiv) {
+                    if (!tableDiv)
                         return;
-                    }
 
                     const panel = tableDiv.getParent(".panel");
                     if (this.lastPanelHeight !== panel.getBoundingClientRect().height) {
@@ -361,9 +359,8 @@ window.qBittorrent.DynamicTable = (function() {
 
             // recreate child nodes when reusing (enables the context menu to work correctly)
             if (ul.hasChildNodes()) {
-                while (ul.firstChild) {
+                while (ul.firstChild)
                     ul.removeChild(ul.lastChild);
-                }
             }
 
             for (let i = 0; i < this.columns.length; ++i) {
@@ -436,9 +433,10 @@ window.qBittorrent.DynamicTable = (function() {
                     columnsOrder.push(v);
             });
 
-            for (let i = 0; i < this.columns.length; ++i)
+            for (let i = 0; i < this.columns.length; ++i) {
                 if (!columnsOrder.contains(this.columns[i].name))
                     columnsOrder.push(this.columns[i].name);
+            }
 
             for (let i = 0; i < this.columns.length; ++i)
                 this.columns[i] = this.columns[columnsOrder[i]];
@@ -478,9 +476,10 @@ window.qBittorrent.DynamicTable = (function() {
         },
 
         getColumnPos: function(columnName) {
-            for (let i = 0; i < this.columns.length; ++i)
+            for (let i = 0; i < this.columns.length; ++i) {
                 if (this.columns[i].name === columnName)
                     return i;
+            }
             return -1;
         },
 
@@ -507,9 +506,8 @@ window.qBittorrent.DynamicTable = (function() {
                 for (let j = 0; j < trs.length; ++j)
                     trs[j].getElements("td")[pos].addClass("invisible");
             }
-            if (this.columns[pos].onResize !== null) {
+            if (this.columns[pos].onResize !== null)
                 this.columns[pos].onResize(columnName);
-            }
         },
 
         getSortedColumn: function() {
@@ -576,12 +574,10 @@ window.qBittorrent.DynamicTable = (function() {
 
             const trs = this.tableBody.getElements("tr");
             trs.each((el, i) => {
-                if (i % 2) {
+                if (i % 2)
                     el.addClass("alt");
-                }
-                else {
+                else
                     el.removeClass("alt");
-                }
             });
         },
 
@@ -668,8 +664,9 @@ window.qBittorrent.DynamicTable = (function() {
                 };
                 this.rows.set(rowId, row);
             }
-            else
+            else {
                 row = this.rows.get(rowId);
+            }
 
             row["data"] = data;
             for (const x in data) {
@@ -702,27 +699,29 @@ window.qBittorrent.DynamicTable = (function() {
 
         getTrByRowId: function(rowId) {
             const trs = this.tableBody.getElements("tr");
-            for (let i = 0; i < trs.length; ++i)
+            for (let i = 0; i < trs.length; ++i) {
                 if (trs[i].rowId === rowId)
                     return trs[i];
+            }
             return null;
         },
 
         updateTable: function(fullUpdate = false) {
             const rows = this.getFilteredAndSortedRows();
 
-            for (let i = 0; i < this.selectedRows.length; ++i)
+            for (let i = 0; i < this.selectedRows.length; ++i) {
                 if (!(this.selectedRows[i] in rows)) {
                     this.selectedRows.splice(i, 1);
                     --i;
                 }
+            }
 
             const trs = this.tableBody.getElements("tr");
 
             for (let rowPos = 0; rowPos < rows.length; ++rowPos) {
                 const rowId = rows[rowPos]["rowId"];
                 let tr_found = false;
-                for (let j = rowPos; j < trs.length; ++j)
+                for (let j = rowPos; j < trs.length; ++j) {
                     if (trs[j]["rowId"] === rowId) {
                         tr_found = true;
                         if (rowPos === j)
@@ -733,8 +732,10 @@ window.qBittorrent.DynamicTable = (function() {
                         trs.splice(rowPos, 0, tmpTr);
                         break;
                     }
-                if (tr_found) // row already exists in the table
+                }
+                if (tr_found) { // row already exists in the table
                     this.updateRow(trs[rowPos], fullUpdate);
+                }
                 else { // else create a new row in the table
                     const tr = new Element("tr");
                     // set tabindex so element receives keydown events
@@ -819,9 +820,8 @@ window.qBittorrent.DynamicTable = (function() {
 
             const rowPos = rows.length;
 
-            while ((rowPos < trs.length) && (trs.length > 0)) {
+            while ((rowPos < trs.length) && (trs.length > 0))
                 trs.pop().destroy();
-            }
         },
 
         setupTr: function(tr) {},
@@ -853,9 +853,8 @@ window.qBittorrent.DynamicTable = (function() {
             this.deselectAll();
             this.rows.empty();
             const trs = this.tableBody.getElements("tr");
-            while (trs.length > 0) {
+            while (trs.length > 0)
                 trs.pop().destroy();
-            }
         },
 
         selectedRowsIds: function() {
@@ -1601,13 +1600,14 @@ window.qBittorrent.DynamicTable = (function() {
                     img.set("alt", country);
                     img.set("title", country);
                 }
-                else
+                else {
                     td.adopt(new Element("img", {
                         "src": img_path,
                         "class": "flags",
                         "alt": country,
                         "title": country
                     }));
+                }
             };
 
             // ip
@@ -1966,9 +1966,8 @@ window.qBittorrent.DynamicTable = (function() {
             checkbox.checked = node.checked === 0;
             checkbox.state = checkbox.checked ? "checked" : "unchecked";
 
-            for (let i = 0; i < node.children.length; ++i) {
+            for (let i = 0; i < node.children.length; ++i)
                 this.toggleNodeTreeCheckbox(node.children[i].rowId, checkState);
-            }
         },
 
         updateGlobalCheckbox: function() {
@@ -2236,9 +2235,8 @@ window.qBittorrent.DynamicTable = (function() {
             }.bind(this);
 
             const rowsString = generateRowsSignature(this.rows);
-            if (!hasRowsChanged(rowsString, this.prevRowsString)) {
+            if (!hasRowsChanged(rowsString, this.prevRowsString))
                 return this.prevFilteredRows;
-            }
 
             // sort, then filter
             const column = this.columns[this.sortedColumn];
@@ -2586,9 +2584,8 @@ window.qBittorrent.DynamicTable = (function() {
             }.bind(this);
 
             const rowsString = generateRowsSignature(this.rows);
-            if (!hasRowsChanged(rowsString, this.prevRowsString)) {
+            if (!hasRowsChanged(rowsString, this.prevRowsString))
                 return this.prevFilteredRows;
-            }
 
             // sort, then filter
             const column = this.columns[this.sortedColumn];
@@ -2739,9 +2736,8 @@ window.qBittorrent.DynamicTable = (function() {
             column["force_hide"] = false;
             column["caption"] = caption;
             column["style"] = style;
-            if (defaultWidth !== -1) {
+            if (defaultWidth !== -1)
                 column["width"] = defaultWidth;
-            }
 
             column["dataProperties"] = [name];
             column["getRowValue"] = function(row, pos) {
@@ -2835,9 +2831,8 @@ window.qBittorrent.DynamicTable = (function() {
             column["force_hide"] = false;
             column["caption"] = caption;
             column["style"] = style;
-            if (defaultWidth !== -1) {
+            if (defaultWidth !== -1)
                 column["width"] = defaultWidth;
-            }
 
             column["dataProperties"] = [name];
             column["getRowValue"] = function(row, pos) {
@@ -2921,9 +2916,8 @@ window.qBittorrent.DynamicTable = (function() {
             column["force_hide"] = false;
             column["caption"] = caption;
             column["style"] = style;
-            if (defaultWidth !== -1) {
+            if (defaultWidth !== -1)
                 column["width"] = defaultWidth;
-            }
 
             column["dataProperties"] = [name];
             column["getRowValue"] = function(row, pos) {
@@ -3008,9 +3002,8 @@ window.qBittorrent.DynamicTable = (function() {
             column["force_hide"] = false;
             column["caption"] = caption;
             column["style"] = style;
-            if (defaultWidth !== -1) {
+            if (defaultWidth !== -1)
                 column["width"] = defaultWidth;
-            }
 
             column["dataProperties"] = [name];
             column["getRowValue"] = function(row, pos) {
@@ -3058,9 +3051,8 @@ window.qBittorrent.DynamicTable = (function() {
             column["force_hide"] = false;
             column["caption"] = caption;
             column["style"] = style;
-            if (defaultWidth !== -1) {
+            if (defaultWidth !== -1)
                 column["width"] = defaultWidth;
-            }
 
             column["dataProperties"] = [name];
             column["getRowValue"] = function(row, pos) {
diff --git a/src/webui/www/private/scripts/file-tree.js b/src/webui/www/private/scripts/file-tree.js
index e22f1dac2..2eaffcbff 100644
--- a/src/webui/www/private/scripts/file-tree.js
+++ b/src/webui/www/private/scripts/file-tree.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.FileTree = (function() {
     const exports = function() {
@@ -77,9 +76,8 @@ window.qBittorrent.FileTree = (function() {
 
         generateNodeMap: function(node) {
             // don't store root node in map
-            if (node.root !== null) {
+            if (node.root !== null)
                 this.nodeMap[node.rowId] = node;
-            }
 
             node.children.each((child) => {
                 this.generateNodeMap(child);
diff --git a/src/webui/www/private/scripts/filesystem.js b/src/webui/www/private/scripts/filesystem.js
index 75a58df08..e167afbef 100644
--- a/src/webui/www/private/scripts/filesystem.js
+++ b/src/webui/www/private/scripts/filesystem.js
@@ -30,9 +30,8 @@
 
 // This file is the JavaScript implementation of base/utils/fs.cpp
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.Filesystem = (function() {
     const exports = function() {
diff --git a/src/webui/www/private/scripts/localpreferences.js b/src/webui/www/private/scripts/localpreferences.js
index 710d2021b..95b051bf4 100644
--- a/src/webui/www/private/scripts/localpreferences.js
+++ b/src/webui/www/private/scripts/localpreferences.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.LocalPreferences = (function() {
     const exports = function() {
diff --git a/src/webui/www/private/scripts/misc.js b/src/webui/www/private/scripts/misc.js
index c338e945a..8881fc4ca 100644
--- a/src/webui/www/private/scripts/misc.js
+++ b/src/webui/www/private/scripts/misc.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.Misc = (function() {
     const exports = function() {
@@ -86,8 +85,9 @@ window.qBittorrent.Misc = (function() {
         }
 
         let ret;
-        if (i === 0)
+        if (i === 0) {
             ret = value + " " + units[i];
+        }
         else {
             const precision = friendlyUnitPrecision(i);
             const offset = Math.pow(10, precision);
diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js
index 6a3a9cfb2..36fa4f931 100644
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@@ -110,9 +110,8 @@ const initializeWindows = function() {
 
     function addClickEvent(el, fn) {
         ["Link", "Button"].each((item) => {
-            if ($(el + item)) {
+            if ($(el + item))
                 $(el + item).addEvent("click", fn);
-            }
         });
     }
 
@@ -125,9 +124,8 @@ const initializeWindows = function() {
         const id = "downloadPage";
         const contentUri = new URI("download.html");
 
-        if (urls && (urls.length > 0)) {
+        if (urls && (urls.length > 0))
             contentUri.setData("urls", urls.map(encodeURIComponent).join("|"));
-        }
 
         new MochaUI.Window({
             id: id,
@@ -877,9 +875,8 @@ const initializeWindows = function() {
             default: {
                 const uniqueTorrents = new Set();
                 for (const torrents of trackerList.get(trackerHashInt).trackerTorrentMap.values()) {
-                    for (const torrent of torrents) {
+                    for (const torrent of torrents)
                         uniqueTorrents.add(torrent);
-                    }
                 }
                 hashes = [...uniqueTorrents];
                 break;
@@ -911,9 +908,8 @@ const initializeWindows = function() {
             default: {
                 const uniqueTorrents = new Set();
                 for (const torrents of trackerList.get(trackerHashInt).trackerTorrentMap.values()) {
-                    for (const torrent of torrents) {
+                    for (const torrent of torrents)
                         uniqueTorrents.add(torrent);
-                    }
                 }
                 hashes = [...uniqueTorrents];
                 break;
@@ -945,9 +941,8 @@ const initializeWindows = function() {
             default: {
                 const uniqueTorrents = new Set();
                 for (const torrents of trackerList.get(trackerHashInt).trackerTorrentMap.values()) {
-                    for (const torrent of torrents) {
+                    for (const torrent of torrents)
                         uniqueTorrents.add(torrent);
-                    }
                 }
                 hashes = [...uniqueTorrents];
                 break;
diff --git a/src/webui/www/private/scripts/piecesbar.js b/src/webui/www/private/scripts/piecesbar.js
index 1d39ddc6b..ebc9ded27 100644
--- a/src/webui/www/private/scripts/piecesbar.js
+++ b/src/webui/www/private/scripts/piecesbar.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PiecesBar = (() => {
     const exports = () => {
@@ -136,13 +135,10 @@ window.qBittorrent.PiecesBar = (() => {
         let maxStatus = 0;
 
         for (const status of pieces) {
-            if (status > maxStatus) {
+            if (status > maxStatus)
                 maxStatus = status;
-            }
-
-            if (status < minStatus) {
+            if (status < minStatus)
                 minStatus = status;
-            }
         }
 
         // if no progress then don't do anything
@@ -220,15 +216,13 @@ window.qBittorrent.PiecesBar = (() => {
             statusValues[STATUS_DOWNLOADING] = Math.min(statusValues[STATUS_DOWNLOADING], 1);
             statusValues[STATUS_DOWNLOADED] = Math.min(statusValues[STATUS_DOWNLOADED], 1);
 
-            if (!lastValue) {
+            if (!lastValue)
                 lastValue = statusValues;
-            }
 
             // group contiguous colors together and draw as a single rectangle
             if ((lastValue[STATUS_DOWNLOADING] === statusValues[STATUS_DOWNLOADING])
-                && (lastValue[STATUS_DOWNLOADED] === statusValues[STATUS_DOWNLOADED])) {
+                && (lastValue[STATUS_DOWNLOADED] === statusValues[STATUS_DOWNLOADED]))
                 continue;
-            }
 
             const rectangleWidth = x - rectangleStart;
             this._drawStatus(ctx, rectangleStart, rectangleWidth, lastValue);
diff --git a/src/webui/www/private/scripts/progressbar.js b/src/webui/www/private/scripts/progressbar.js
index 21327c976..b807923b1 100644
--- a/src/webui/www/private/scripts/progressbar.js
+++ b/src/webui/www/private/scripts/progressbar.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.ProgressBar = (function() {
     const exports = function() {
diff --git a/src/webui/www/private/scripts/prop-files.js b/src/webui/www/private/scripts/prop-files.js
index 0e3cadc03..214792139 100644
--- a/src/webui/www/private/scripts/prop-files.js
+++ b/src/webui/www/private/scripts/prop-files.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PropFiles = (function() {
     const exports = function() {
@@ -496,16 +495,14 @@ window.qBittorrent.PropFiles = (function() {
 
     const expandFolder = function(id) {
         const node = torrentFilesTable.getNode(id);
-        if (node.isFolder) {
+        if (node.isFolder)
             expandNode(node);
-        }
     };
 
     const collapseFolder = function(id) {
         const node = torrentFilesTable.getNode(id);
-        if (node.isFolder) {
+        if (node.isFolder)
             collapseNode(node);
-        }
     };
 
     const filesPriorityMenuClicked = function(priority) {
@@ -590,12 +587,10 @@ window.qBittorrent.PropFiles = (function() {
                 if (!hash)
                     return;
 
-                if (torrentFilesTable.selectedRowsIds().length > 1) {
+                if (torrentFilesTable.selectedRowsIds().length > 1)
                     multiFileRename(hash);
-                }
-                else {
+                else
                     singleFileRename(hash);
-                }
             },
 
             FilePrioIgnore: function(element, ref) {
diff --git a/src/webui/www/private/scripts/prop-general.js b/src/webui/www/private/scripts/prop-general.js
index ee83411db..96a48f3ba 100644
--- a/src/webui/www/private/scripts/prop-general.js
+++ b/src/webui/www/private/scripts/prop-general.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PropGeneral = (function() {
     const exports = function() {
@@ -233,12 +232,11 @@ window.qBittorrent.PropGeneral = (function() {
             onSuccess: function(data) {
                 $("error_div").set("html", "");
 
-                if (data) {
+                if (data)
                     piecesBar.setPieces(data);
-                }
-                else {
+                else
                     clearData();
-                }
+
                 clearTimeout(loadTorrentDataTimer);
                 loadTorrentDataTimer = loadTorrentData.delay(5000);
             }
diff --git a/src/webui/www/private/scripts/prop-peers.js b/src/webui/www/private/scripts/prop-peers.js
index c3af13166..a312affc5 100644
--- a/src/webui/www/private/scripts/prop-peers.js
+++ b/src/webui/www/private/scripts/prop-peers.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PropPeers = (function() {
     const exports = function() {
diff --git a/src/webui/www/private/scripts/prop-trackers.js b/src/webui/www/private/scripts/prop-trackers.js
index df18eba42..f6c746580 100644
--- a/src/webui/www/private/scripts/prop-trackers.js
+++ b/src/webui/www/private/scripts/prop-trackers.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PropTrackers = (function() {
     const exports = function() {
diff --git a/src/webui/www/private/scripts/prop-webseeds.js b/src/webui/www/private/scripts/prop-webseeds.js
index 39cd4d3f4..e2e4ab31e 100644
--- a/src/webui/www/private/scripts/prop-webseeds.js
+++ b/src/webui/www/private/scripts/prop-webseeds.js
@@ -28,9 +28,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.PropWebseeds = (function() {
     const exports = function() {
@@ -65,9 +64,8 @@ window.qBittorrent.PropWebseeds = (function() {
 
         updateRow: function(tr, row) {
             const tds = tr.getElements("td");
-            for (let i = 0; i < row.length; ++i) {
+            for (let i = 0; i < row.length; ++i)
                 tds[i].set("html", row[i]);
-            }
             return true;
         },
 
diff --git a/src/webui/www/private/scripts/rename-files.js b/src/webui/www/private/scripts/rename-files.js
index 23bc06438..4bd37f839 100644
--- a/src/webui/www/private/scripts/rename-files.js
+++ b/src/webui/www/private/scripts/rename-files.js
@@ -1,8 +1,7 @@
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.MultiRename = (function() {
     const exports = function() {
@@ -68,12 +67,10 @@ window.qBittorrent.MultiRename = (function() {
 
                     // regex assertions don't modify lastIndex,
                     // so we need to explicitly break out to prevent infinite loop
-                    if (lastIndex === regex.lastIndex) {
+                    if (lastIndex === regex.lastIndex)
                         break;
-                    }
-                    else {
+                    else
                         lastIndex = regex.lastIndex;
-                    }
 
                     // Maximum of 250 matches per file
                     ++count;
@@ -124,14 +121,15 @@ window.qBittorrent.MultiRename = (function() {
             this.matchedFiles = [];
 
             // Ignore empty searches
-            if (!this._inner_search) {
+            if (!this._inner_search)
                 return;
-            }
 
             // Setup regex flags
             let regexFlags = "";
-            if (this.matchAllOccurrences) { regexFlags += "g"; }
-            if (!this.caseSensitive) { regexFlags += "i"; }
+            if (this.matchAllOccurrences)
+                regexFlags += "g";
+            if (!this.caseSensitive)
+                regexFlags += "i";
 
             // Setup regex search
             const regexEscapeExp = new RegExp(/[/\-\\^$*+?.()|[\]{}]/g);
@@ -153,17 +151,17 @@ window.qBittorrent.MultiRename = (function() {
                 const row = this.selectedFiles[i];
 
                 // Ignore files
-                if (!row.isFolder && !this.includeFiles) {
+                if (!row.isFolder && !this.includeFiles)
                     continue;
-                }
+
                 // Ignore folders
-                else if (row.isFolder && !this.includeFolders) {
+                else if (row.isFolder && !this.includeFolders)
                     continue;
-                }
 
                 // Get file extension and reappend the "." (only when the file has an extension)
                 let fileExtension = window.qBittorrent.Filesystem.fileExtension(row.original);
-                if (fileExtension) { fileExtension = "." + fileExtension; }
+                if (fileExtension)
+                    fileExtension = "." + fileExtension;
 
                 const fileNameWithoutExt = row.original.slice(0, row.original.lastIndexOf(fileExtension));
 
@@ -183,9 +181,8 @@ window.qBittorrent.MultiRename = (function() {
                         break;
                 }
                 // Ignore rows without a match
-                if (!matches || (matches.length === 0)) {
+                if (!matches || (matches.length === 0))
                     continue;
-                }
 
                 let renamed = row.original;
                 for (let i = matches.length - 1; i >= 0; --i) {
@@ -194,7 +191,8 @@ window.qBittorrent.MultiRename = (function() {
                     // Replace numerical groups
                     for (let g = 0; g < match.length; ++g) {
                         const group = match[g];
-                        if (!group) { continue; }
+                        if (!group)
+                            continue;
                         replacement = replaceGroup(replacement, `$${g}`, group, "\\", false);
                     }
                     // Replace named groups
@@ -266,9 +264,8 @@ window.qBittorrent.MultiRename = (function() {
             if (this.replaceAll) {
                 // matchedFiles are in DFS order so we rename in reverse
                 // in order to prevent unwanted folder creation
-                for (let i = replacements - 1; i >= 0; --i) {
+                for (let i = replacements - 1; i >= 0; --i)
                     await _inner_rename(i);
-                }
             }
             else {
                 // single replacements go linearly top-down because the
diff --git a/src/webui/www/private/scripts/search.js b/src/webui/www/private/scripts/search.js
index 56827a756..f205882e0 100644
--- a/src/webui/www/private/scripts/search.js
+++ b/src/webui/www/private/scripts/search.js
@@ -23,9 +23,8 @@
 
 "use strict";
 
-if (window.qBittorrent === undefined) {
+if (window.qBittorrent === undefined)
     window.qBittorrent = {};
-}
 
 window.qBittorrent.Search = (function() {
     const exports = function() {
@@ -145,9 +144,8 @@ window.qBittorrent.Search = (function() {
 
         // restore search tabs
         const searchJobs = JSON.parse(LocalPreferences.get("search_jobs", "[]"));
-        for (const { id, pattern } of searchJobs) {
+        for (const { id, pattern } of searchJobs)
             createSearchTab(id, pattern);
-        }
     };
 
     const numSearchTabs = function() {
@@ -226,9 +224,8 @@ window.qBittorrent.Search = (function() {
         const currentSearchId = getSelectedSearchId();
         const state = searchState.get(currentSearchId);
         // don't bother sending a stop request if already stopped
-        if (state && state.running) {
+        if (state && state.running)
             stopSearch(searchId);
-        }
 
         tab.destroy();
 
@@ -310,9 +307,8 @@ window.qBittorrent.Search = (function() {
         // restore table rows
         searchResultsTable.clear();
         if (state) {
-            for (const row of state.rows) {
+            for (const row of state.rows)
                 searchResultsTable.updateRowData(row);
-            }
 
             rowsToSelect = state.selectedRowIds;
 
@@ -352,9 +348,8 @@ window.qBittorrent.Search = (function() {
         searchResultsTable.altRow();
 
         // must reselect rows after calling updateTable
-        if (rowsToSelect.length > 0) {
+        if (rowsToSelect.length > 0)
             searchResultsTable.reselectRows(rowsToSelect);
-        }
 
         $("numSearchResultsVisible").set("html", searchResultsTable.getFilteredAndSortedRows().length);
         $("numSearchResultsTotal").set("html", searchResultsTable.getRowIds().length);
@@ -494,7 +489,7 @@ window.qBittorrent.Search = (function() {
 
     const manageSearchPlugins = function() {
         const id = "searchPlugins";
-        if (!$(id))
+        if (!$(id)) {
             new MochaUI.Window({
                 id: id,
                 title: "QBT_TR(Search plugins)QBT_TR[CONTEXT=PluginSelectDlg]",
@@ -516,6 +511,7 @@ window.qBittorrent.Search = (function() {
                     clearTimeout(loadSearchPluginsTimer);
                 }
             });
+        }
     };
 
     const loadSearchPlugins = function() {
@@ -552,17 +548,19 @@ window.qBittorrent.Search = (function() {
     };
 
     const reselectCategory = function() {
-        for (let i = 0; i < $("categorySelect").options.length; ++i)
+        for (let i = 0; i < $("categorySelect").options.length; ++i) {
             if ($("categorySelect").options[i].get("value") === selectedCategory)
                 $("categorySelect").options[i].selected = true;
+        }
 
         categorySelected();
     };
 
     const reselectPlugin = function() {
-        for (let i = 0; i < $("pluginsSelect").options.length; ++i)
+        for (let i = 0; i < $("pluginsSelect").options.length; ++i) {
             if ($("pluginsSelect").options[i].get("value") === selectedPlugin)
                 $("pluginsSelect").options[i].selected = true;
+        }
 
         pluginSelected();
     };
@@ -606,9 +604,8 @@ window.qBittorrent.Search = (function() {
                 if ((selectedPlugin === "enabled") && !plugin.enabled)
                     continue;
                 for (const category of plugin.supportedCategories) {
-                    if (uniqueCategories[category.id] === undefined) {
+                    if (uniqueCategories[category.id] === undefined)
                         uniqueCategories[category.id] = category;
-                    }
                 }
             }
             // we must sort the ids to maintain consistent order.
@@ -644,9 +641,8 @@ window.qBittorrent.Search = (function() {
                     const searchPluginsEmpty = (searchPlugins.length === 0);
                     if (!searchPluginsEmpty) {
                         $("searchResultsNoPlugins").style.display = "none";
-                        if (numSearchTabs() === 0) {
+                        if (numSearchTabs() === 0)
                             $("searchResultsNoSearches").style.display = "block";
-                        }
 
                         // sort plugins alphabetically
                         const allPlugins = searchPlugins.sort((left, right) => {
@@ -681,9 +677,10 @@ window.qBittorrent.Search = (function() {
     };
 
     const getPlugin = function(name) {
-        for (let i = 0; i < searchPlugins.length; ++i)
+        for (let i = 0; i < searchPlugins.length; ++i) {
             if (searchPlugins[i].name === name)
                 return searchPlugins[i];
+        }
 
         return null;
     };
@@ -743,14 +740,16 @@ window.qBittorrent.Search = (function() {
     };
 
     const setupSearchTableEvents = function(enable) {
-        if (enable)
+        if (enable) {
             $$(".searchTableRow").each((target) => {
                 target.addEventListener("dblclick", downloadSearchTorrent, false);
             });
-        else
+        }
+        else {
             $$(".searchTableRow").each((target) => {
                 target.removeEventListener("dblclick", downloadSearchTorrent, false);
             });
+        }
     };
 
     const loadSearchResultsData = function(searchId) {
@@ -819,9 +818,8 @@ window.qBittorrent.Search = (function() {
 
                     // only update table if this search is currently being displayed
                     if (searchId === getSelectedSearchId()) {
-                        for (const row of newRows) {
+                        for (const row of newRows)
                             searchResultsTable.updateRowData(row);
-                        }
 
                         $("numSearchResultsVisible").set("html", searchResultsTable.getFilteredAndSortedRows().length);
                         $("numSearchResultsTotal").set("html", searchResultsTable.getRowIds().length);
diff --git a/src/webui/www/private/scripts/speedslider.js b/src/webui/www/private/scripts/speedslider.js
index aad3bb0ce..8cbc45e90 100644
--- a/src/webui/www/private/scripts/speedslider.js
+++ b/src/webui/www/private/scripts/speedslider.js
@@ -92,11 +92,12 @@ MochaUI.extend({
                             onSuccess: function(data) {
                                 if (data) {
                                     let up_limit = data[hashes[0]];
-                                    for (const key in data)
+                                    for (const key in data) {
                                         if (up_limit !== data[key]) {
                                             up_limit = 0;
                                             break;
                                         }
+                                    }
                                     if (up_limit < 0)
                                         up_limit = 0;
                                     new Slider($("uplimitSliderarea"), $("uplimitSliderknob"), {
@@ -195,11 +196,12 @@ MochaUI.extend({
                             onSuccess: function(data) {
                                 if (data) {
                                     let dl_limit = data[hashes[0]];
-                                    for (const key in data)
+                                    for (const key in data) {
                                         if (dl_limit !== data[key]) {
                                             dl_limit = 0;
                                             break;
                                         }
+                                    }
                                     if (dl_limit < 0)
                                         dl_limit = 0;
                                     new Slider($("dllimitSliderarea"), $("dllimitSliderknob"), {
diff --git a/src/webui/www/private/shareratio.html b/src/webui/www/private/shareratio.html
index 26e0dcd0b..599217a31 100644
--- a/src/webui/www/private/shareratio.html
+++ b/src/webui/www/private/shareratio.html
@@ -79,9 +79,8 @@
             $("save").addEvent("click", (e) => {
                 new Event(e).stop();
 
-                if (!isFormValid()) {
+                if (!isFormValid())
                     return false;
-                }
 
                 const shareLimit = getSelectedRadioValue("shareLimit");
                 let ratioLimitValue = 0.00;
@@ -124,9 +123,8 @@
 
             for (let i = 0; i < radios.length; ++i) {
                 const radio = radios[i];
-                if (radio.checked) {
+                if (radio.checked)
                     return (radio).get("value");
-                }
             }
         }
 
diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html
index 668ba8feb..3d2ee024b 100644
--- a/src/webui/www/private/upload.html
+++ b/src/webui/www/private/upload.html
@@ -169,9 +169,8 @@
                 window.parent.qBittorrent.Client.closeWindows();
         });
 
-        if ((Browser.platform === "ios") || ((Browser.platform === "mac") && (navigator.maxTouchPoints > 1))) {
+        if ((Browser.platform === "ios") || ((Browser.platform === "mac") && (navigator.maxTouchPoints > 1)))
             $("fileselect").accept = ".torrent";
-        }
     </script>
 </body>
 
diff --git a/src/webui/www/private/views/filters.html b/src/webui/www/private/views/filters.html
index f0ad436e5..cf73c2ba3 100644
--- a/src/webui/www/private/views/filters.html
+++ b/src/webui/www/private/views/filters.html
@@ -44,9 +44,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.Filters = (function() {
         const exports = function() {
diff --git a/src/webui/www/private/views/installsearchplugin.html b/src/webui/www/private/views/installsearchplugin.html
index ce7068ef0..e44a29ef8 100644
--- a/src/webui/www/private/views/installsearchplugin.html
+++ b/src/webui/www/private/views/installsearchplugin.html
@@ -29,9 +29,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.InstallSearchPlugin = (function() {
         const exports = function() {
@@ -62,7 +61,7 @@
 
         const newPluginOk = function() {
             const path = $("newPluginPath").get("value").trim();
-            if (path)
+            if (path) {
                 new Request({
                     url: "api/v2/search/installPlugin",
                     method: "post",
@@ -73,6 +72,7 @@
                         window.qBittorrent.SearchPlugins.closeSearchWindow("installSearchPlugin");
                     }
                 }).send();
+            }
         };
 
         init();
diff --git a/src/webui/www/private/views/log.html b/src/webui/www/private/views/log.html
index 455b48fc7..cc2e3b27d 100644
--- a/src/webui/www/private/views/log.html
+++ b/src/webui/www/private/views/log.html
@@ -148,9 +148,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.Log = (() => {
         const exports = () => {
@@ -190,12 +189,10 @@
 
         const init = () => {
             $("logLevelSelect").getElements("option").each((x) => {
-                if (selectedLogLevels.indexOf(x.value.toString()) !== -1) {
+                if (selectedLogLevels.indexOf(x.value.toString()) !== -1)
                     x.selected = true;
-                }
-                else {
+                else
                     x.selected = false;
-                }
             });
 
             selectBox = new vanillaSelectBox("#logLevelSelect", {
@@ -330,9 +327,9 @@
             logFilterTimer = -1;
             load();
 
-            if (tableInfo[currentSelectedTab].instance.filterText !== getFilterText()) {
+            if (tableInfo[currentSelectedTab].instance.filterText !== getFilterText())
                 tableInfo[currentSelectedTab].instance.updateTable();
-            }
+
             updateLabelCount();
         };
 
diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html
index 2fdc6d003..c01be0ee6 100644
--- a/src/webui/www/private/views/preferences.html
+++ b/src/webui/www/private/views/preferences.html
@@ -1537,9 +1537,8 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.Preferences = (function() {
         const exports = function() {
@@ -1893,12 +1892,10 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
         };
 
         const registerDynDns = function() {
-            if ($("dyndns_select").getProperty("value").toInt() === 1) {
+            if ($("dyndns_select").getProperty("value").toInt() === 1)
                 window.open("http://www.no-ip.com/services/managed_dns/free_dynamic_dns.html", "NO-IP Registration");
-            }
-            else {
+            else
                 window.open("https://www.dyndns.com/account/services/hosts/add.html", "DynDNS Registration");
-            }
         };
 
         const generateRandomPort = function() {
diff --git a/src/webui/www/private/views/rss.html b/src/webui/www/private/views/rss.html
index 50cda410d..3e6e2f518 100644
--- a/src/webui/www/private/views/rss.html
+++ b/src/webui/www/private/views/rss.html
@@ -158,9 +158,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     const serverSyncRssDataInterval = 1500;
 
@@ -369,12 +368,13 @@
 
             let visibleArticles = [];
             for (const feedEntry in feedData) {
-                if (childFeeds.has(feedEntry))
+                if (childFeeds.has(feedEntry)) {
                     visibleArticles.append(feedData[feedEntry]
                         .map((a) => {
                             a.feedUid = feedEntry;
                             return a;
                         }));
+                }
             }
             //filter read articles if "Unread" feed is selected
             if (path === "")
@@ -712,9 +712,10 @@
 
         const markItemAsRead = (path) => {
             // feed data mark as read
-            for (const feedID in feedData)
+            for (const feedID in feedData) {
                 if (pathByFeedId.get(feedID).slice(0, path.length) === path)
                     feedData[feedID].each((el) => el.isRead = true);
+            }
 
             // mark rows as read
             rssArticleTable.rows.each((el) => el.full_data.isRead = true);
diff --git a/src/webui/www/private/views/rssDownloader.html b/src/webui/www/private/views/rssDownloader.html
index 16bed2c0b..280de7f18 100644
--- a/src/webui/www/private/views/rssDownloader.html
+++ b/src/webui/www/private/views/rssDownloader.html
@@ -330,9 +330,8 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.RssDownloader = (() => {
         const exports = () => {
diff --git a/src/webui/www/private/views/searchplugins.html b/src/webui/www/private/views/searchplugins.html
index 44c0e459c..e913ff670 100644
--- a/src/webui/www/private/views/searchplugins.html
+++ b/src/webui/www/private/views/searchplugins.html
@@ -79,9 +79,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.SearchPlugins = (function() {
         const exports = function() {
@@ -187,16 +186,18 @@
         };
 
         const setupSearchPluginTableEvents = function(enable) {
-            if (enable)
+            if (enable) {
                 $$(".searchPluginsTableRow").each((target) => {
                     target.addEventListener("dblclick", enablePlugin, false);
                     target.addEventListener("contextmenu", updateSearchPluginsTableContextMenuOffset, true);
                 });
-            else
+            }
+            else {
                 $$(".searchPluginsTableRow").each((target) => {
                     target.removeEventListener("dblclick", enablePlugin, false);
                     target.removeEventListener("contextmenu", updateSearchPluginsTableContextMenuOffset, true);
                 });
+            }
         };
 
         const updateTable = function() {
diff --git a/src/webui/www/private/views/transferlist.html b/src/webui/www/private/views/transferlist.html
index 08b12c2bd..a94716585 100644
--- a/src/webui/www/private/views/transferlist.html
+++ b/src/webui/www/private/views/transferlist.html
@@ -18,9 +18,8 @@
 <script>
     "use strict";
 
-    if (window.qBittorrent === undefined) {
+    if (window.qBittorrent === undefined)
         window.qBittorrent = {};
-    }
 
     window.qBittorrent.TransferList = (function() {
         const exports = function() {