diff --git a/src/scripts/dashboardpage.js b/src/scripts/dashboardpage.js
index 02567f419d..7d92702b83 100644
--- a/src/scripts/dashboardpage.js
+++ b/src/scripts/dashboardpage.js
@@ -1,8 +1,8 @@
 define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "humanedate", "listViewStyle", "emby-linkbutton", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog) {
     "use strict";
 
-    function onConnectionHelpClick(e__q) {
-        e__q.preventDefault();
+    function onConnectionHelpClick(evt) {
+        evt.preventDefault();
         return false;
     }
 
@@ -15,7 +15,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         }
     }
 
-    function onEditServerNameClick(e__w) {
+    function onEditServerNameClick(evt) {
         var page = dom.parentWithClass(this, "page");
 
         require(["prompt"], function (prompt) {
@@ -36,7 +36,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             });
         });
 
-        e__w.preventDefault();
+        evt.preventDefault();
         return false;
     }
 
@@ -54,16 +54,14 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 text.push(globalize.translate("sharedcomponents#DirectStreamHelp1"));
                 text.push("<br/>");
                 text.push(globalize.translate("sharedcomponents#DirectStreamHelp2"));
-            } else {
-                if (isTranscode) {
-                    title = globalize.translate("sharedcomponents#Transcoding");
-                    text.push(globalize.translate("sharedcomponents#MediaIsBeingConverted"));
+            } else if (isTranscode) {
+                title = globalize.translate("sharedcomponents#Transcoding");
+                text.push(globalize.translate("sharedcomponents#MediaIsBeingConverted"));
 
-                    if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
-                        text.push("<br/>");
-                        text.push(globalize.translate("sharedcomponents#LabelReasonForTranscoding"));
-                        showTranscodeReasons = true;
-                    }
+                if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length) {
+                    text.push("<br/>");
+                    text.push(globalize.translate("sharedcomponents#LabelReasonForTranscoding"));
+                    showTranscodeReasons = true;
                 }
             }
 
@@ -131,37 +129,29 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         });
     }
 
-    function onActiveDevicesClick(e__r) {
-        var btn = dom.parentWithClass(e__r.target, "sessionCardButton");
+    function onActiveDevicesClick(evt) {
+        var btn = dom.parentWithClass(evt.target, "sessionCardButton");
 
         if (btn) {
             var card = dom.parentWithClass(btn, "card");
 
             if (card) {
                 var sessionId = card.id;
-                var session = (DashboardPage.sessionsList || []).filter(function (s__t) {
-                    return "session" + s__t.Id === sessionId;
+                var session = (DashboardPage.sessionsList || []).filter(function (dashboardSession) {
+                    return "session" + dashboardSession.Id === sessionId;
                 })[0];
 
                 if (session) {
                     if (btn.classList.contains("btnCardOptions")) {
                         showOptionsMenu(btn, session);
-                    } else {
-                        if (btn.classList.contains("btnSessionInfo")) {
-                            showPlaybackInfo(btn, session);
-                        } else {
-                            if (btn.classList.contains("btnSessionSendMessage")) {
-                                showSendMessageForm(btn, session);
-                            } else {
-                                if (btn.classList.contains("btnSessionStop")) {
-                                    connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, "Stop");
-                                } else {
-                                    if (btn.classList.contains("btnSessionPlayPause") && session.PlayState) {
-                                        connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, "PlayPause");
-                                    }
-                                }
-                            }
-                        }
+                    } else if (btn.classList.contains("btnSessionInfo")) {
+                        showPlaybackInfo(btn, session);
+                    } else if (btn.classList.contains("btnSessionSendMessage")) {
+                        showSendMessageForm(btn, session);
+                    } else if (btn.classList.contains("btnSessionStop")) {
+                        connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, "Stop");
+                    } else if (btn.classList.contains("btnSessionPlayPause") && session.PlayState) {
+                        connectionManager.getApiClient(session.ServerId).sendPlayStateCommand(session.Id, "PlayPause");
                     }
                 }
             }
@@ -181,7 +171,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 }
             }
         }
-
         return list;
     }
 
@@ -278,8 +267,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             cardElem.classList.add("deadSession");
         }
 
-        for (var i__u = 0, length = sessions.length; i__u < length; i__u++) {
-            var session = sessions[i__u];
+        for (var i = 0, length = sessions.length; i < length; i++) {
+            var session = sessions[i];
             var rowId = "session" + session.Id;
             var elem = view.querySelector("#" + rowId);
 
@@ -383,9 +372,9 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
 
     function renderRunningTasks(view, tasks) {
         var html = "";
-        tasks = tasks.filter(function (t__o) {
-            if ("Idle" != t__o.State) {
-                return !t__o.IsHidden;
+        tasks = tasks.filter(function (task) {
+            if ("Idle" != task.State) {
+                return !task.IsHidden;
             }
 
             return false;
@@ -397,8 +386,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             view.querySelector(".runningTasksContainer").classList.add("hide");
         }
 
-        for (var i__i = 0, length = tasks.length; i__i < length; i__i++) {
-            var task = tasks[i__i];
+        for (var i = 0, length = tasks.length; i < length; i++) {
+            var task = tasks[i];
 
             if (html += "<p>", html += task.Name + "<br/>", "Running" == task.State) {
                 var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
@@ -407,10 +396,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 html += "</progress>";
                 html += "<span style='color:#009F00;margin-left:5px;margin-right:5px;'>" + progress + "%</span>";
                 html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate("ButtonStop") + '" onclick="DashboardPage.stopTask(this, \'' + task.Id + '\');" class="autoSize"><i class="md-icon">cancel</i></button>';
-            } else {
-                if ("Cancelling" == task.State) {
-                    html += '<span style="color:#cc0000;">' + globalize.translate("LabelStopping") + "</span>";
-                }
+            } else if ("Cancelling" == task.State) {
+                html += '<span style="color:#cc0000;">' + globalize.translate("LabelStopping") + "</span>";
             }
 
             html += "</p>";
@@ -519,10 +506,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
                     bottomText = topText;
                     topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
-                } else {
-                    if (nowPlayingItem.ProductionYear) {
-                        bottomText = nowPlayingItem.ProductionYear;
-                    }
+                } else if (nowPlayingItem.ProductionYear) {
+                    bottomText = nowPlayingItem.ProductionYear;
                 }
             }
 
@@ -560,8 +545,8 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 html.push(session.UserName);
             }
 
-            for (var i__p = 0, length = session.AdditionalUsers.length; i__p < length; i__p++) {
-                html.push(session.AdditionalUsers[i__p].UserName);
+            for (var i = 0, length = session.AdditionalUsers.length; i < length; i++) {
+                html.push(session.AdditionalUsers[i].UserName);
             }
 
             return html.join(", ");
@@ -809,45 +794,45 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         }
     };
     return function (view, params) {
-        function onRestartRequired(e__a, apiClient) {
+        function onRestartRequired(evt, apiClient) {
             if (apiClient.serverId() === serverId) {
                 renderHasPendingRestart(view, apiClient, true);
             }
         }
 
-        function onServerShuttingDown(e__s, apiClient) {
+        function onServerShuttingDown(evt, apiClient) {
             if (apiClient.serverId() === serverId) {
                 renderHasPendingRestart(view, apiClient, true);
             }
         }
 
-        function onServerRestarting(e__d, apiClient) {
+        function onServerRestarting(evt, apiClient) {
             if (apiClient.serverId() === serverId) {
                 renderHasPendingRestart(view, apiClient, true);
             }
         }
 
-        function onPackageInstalling(e__f, apiClient) {
+        function onPackageInstalling(evt, apiClient) {
             if (apiClient.serverId() === serverId) {
                 pollForInfo(view, apiClient, true);
                 reloadSystemInfo(view, apiClient);
             }
         }
 
-        function onPackageInstallationCompleted(e__g, apiClient) {
+        function onPackageInstallationCompleted(evt, apiClient) {
             if (apiClient.serverId() === serverId) {
                 pollForInfo(view, apiClient, true);
                 reloadSystemInfo(view, apiClient);
             }
         }
 
-        function onSessionsUpdate(e__h, apiClient, info) {
+        function onSessionsUpdate(evt, apiClient, info) {
             if (apiClient.serverId() === serverId) {
                 renderInfo(view, info);
             }
         }
 
-        function onScheduledTasksUpdate(e__j, apiClient, info) {
+        function onScheduledTasksUpdate(evt, apiClient, info) {
             if (apiClient.serverId() === serverId) {
                 renderRunningTasks(view, info);
             }
@@ -865,6 +850,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 loading.show();
                 pollForInfo(page, apiClient);
                 DashboardPage.startInterval(apiClient);
+                // TODO we currently don't support packages and thus these events are useless
                 events.on(serverNotifications, "RestartRequired", onRestartRequired);
                 events.on(serverNotifications, "ServerShuttingDown", onServerShuttingDown);
                 events.on(serverNotifications, "ServerRestarting", onServerRestarting);
@@ -896,8 +882,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             }
         });
         view.addEventListener("viewbeforehide", function () {
-            var apiClient = ApiClient; // TODO we currently don't support packages and thus these events are useless
-
+            var apiClient = ApiClient;
             events.off(serverNotifications, "RestartRequired", onRestartRequired);
             events.off(serverNotifications, "ServerShuttingDown", onServerShuttingDown);
             events.off(serverNotifications, "ServerRestarting", onServerRestarting);
@@ -913,13 +898,10 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
         view.addEventListener("viewdestroy", function () {
             var page = this;
             var userActivityLog = page.userActivityLog;
-
             if (userActivityLog) {
                 userActivityLog.destroy();
             }
-
             var serverActivityLog = page.serverActivityLog;
-
             if (serverActivityLog) {
                 serverActivityLog.destroy();
             }
diff --git a/src/scripts/livetvsuggested.js b/src/scripts/livetvsuggested.js
index 4c33dcba16..c341986d36 100644
--- a/src/scripts/livetvsuggested.js
+++ b/src/scripts/livetvsuggested.js
@@ -9,7 +9,6 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
         if (enableScrollX()) {
             return "overflowBackdrop";
         }
-
         return "backdrop";
     }
 
@@ -17,7 +16,6 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
         if (enableScrollX()) {
             return "overflowPortrait";
         }
-
         return "portrait";
     }
 
@@ -25,7 +23,6 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
         if (enableScrollX()) {
             return 12;
         }
-
         return 9;
     }
 
@@ -153,22 +150,15 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
     }
 
     function getTabs() {
-        return [{
-            name: globalize.translate("Programs")
-        }, {
-            name: globalize.translate("TabGuide")
-        }, {
-            name: globalize.translate("TabChannels")
-        }, {
-            name: globalize.translate("TabRecordings")
-        }, {
-            name: globalize.translate("HeaderSchedule")
-        }, {
-            name: globalize.translate("TabSeries")
-        }, {
-            name: globalize.translate("ButtonSearch"),
-            cssClass: "searchTabButton"
-        }];
+        return [
+            { name: globalize.translate("Programs") },
+            { name: globalize.translate("TabGuide") },
+            { name: globalize.translate("TabChannels") },
+            { name: globalize.translate("TabRecordings") },
+            { name: globalize.translate("HeaderSchedule") },
+            { name: globalize.translate("TabSeries") },
+            { name: globalize.translate("ButtonSearch"), cssClass: "searchTabButton" }
+        ];
     }
 
     function setScrollClasses(elem, scrollX) {
@@ -190,13 +180,10 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
     }
 
     function getDefaultTabIndex(folderId) {
-        switch (userSettings.get("landing-" + folderId)) {
-            case "guide":
-                return 1;
-
-            default:
-                return 0;
+        if (userSettings.get("landing-" + folderId) === "guide") {
+            return 1;
         }
+        return 0;
     }
 
     return function (view, params) {
@@ -204,18 +191,18 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
             return new Date().getTime() - lastFullRender > 3e5;
         }
 
-        function onBeforeTabChange(e__q) {
-            preLoadTab(view, parseInt(e__q.detail.selectedTabIndex));
+        function onBeforeTabChange(evt) {
+            preLoadTab(view, parseInt(evt.detail.selectedTabIndex));
         }
 
-        function onTabChange(e__w) {
-            var previousTabController = tabControllers[parseInt(e__w.detail.previousIndex)];
+        function onTabChange(evt) {
+            var previousTabController = tabControllers[parseInt(evt.detail.previousIndex)];
 
             if (previousTabController && previousTabController.onHide) {
                 previousTabController.onHide();
             }
 
-            loadTab(view, parseInt(e__w.detail.selectedTabIndex));
+            loadTab(view, parseInt(evt.detail.selectedTabIndex));
         }
 
         function getTabContainers() {
@@ -229,30 +216,25 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
         function getTabController(page, index, callback) {
             var depends = [];
 
+            // TODO int is a little hard to read
             switch (index) {
                 case 0:
                     break;
-
                 case 1:
                     depends.push("scripts/livetvguide");
                     break;
-
                 case 2:
                     depends.push("scripts/livetvchannels");
                     break;
-
                 case 3:
                     depends.push("scripts/livetvrecordings");
                     break;
-
                 case 4:
                     depends.push("scripts/livetvschedule");
                     break;
-
                 case 5:
                     depends.push("scripts/livetvseriestimers");
                     break;
-
                 case 6:
                     depends.push("scripts/searchtab");
             }
@@ -269,9 +251,15 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
 
                 if (!controller) {
                     tabContent = view.querySelector(".pageTabContent[data-index='" + index + "']");
-                    controller = 0 === index ? self : 6 === index ? new controllerFactory(view, tabContent, {
-                        collectionType: "livetv"
-                    }) : new controllerFactory(view, params, tabContent);
+                    if (0 === index) {
+                        controller = self;
+                    } else if (6 === index) {
+                        controller = new controllerFactory(view, tabContent, {
+                            collectionType: "livetv"
+                        });
+                    } else {
+                        controller = new controllerFactory(view, params, tabContent);
+                    }
                     tabControllers[index] = controller;
 
                     if (controller.initTab) {
@@ -285,7 +273,7 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
 
         function preLoadTab(page, index) {
             getTabController(page, index, function (controller) {
-                if (-1 == renderedTabs.indexOf(index) && controller.preRender) {
+                if (renderedTabs.indexOf(index) === -1 && controller.preRender) {
                     controller.preRender();
                 }
             });
@@ -308,21 +296,18 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
                     }
 
                     controller.renderTab();
-                } else {
-                    if (controller.onShow) {
-                        controller.onShow();
-                    }
+                } else if (controller.onShow) {
+                    controller.onShow();
                 }
 
                 currentTabController = controller;
             });
         }
 
-        function onInputCommand(e__e) {
-            switch (e__e.detail.command) {
-                case "search":
-                    e__e.preventDefault();
-                    Dashboard.navigate("search.html?collectionType=livetv");
+        function onInputCommand(evt) {
+            if (evt.detail.command === "search") {
+                evt.preventDefault();
+                Dashboard.navigate("search.html?collectionType=livetv");
             }
         }
 
@@ -343,8 +328,8 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
             var tabContent = view.querySelector(".pageTabContent[data-index='0']");
             var containers = tabContent.querySelectorAll(".itemsContainer");
 
-            for (var i__r = 0, length = containers.length; i__r < length; i__r++) {
-                setScrollClasses(containers[i__r], enableScrollX());
+            for (var i = 0, length = containers.length; i < length; i++) {
+                setScrollClasses(containers[i], enableScrollX());
             }
         };
 
@@ -362,31 +347,28 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
         var currentTabController;
         var tabControllers = [];
         var renderedTabs = [];
-        view.addEventListener("viewbeforeshow", function (e__t) {
-            isViewRestored = e__t.detail.isRestored;
+        view.addEventListener("viewbeforeshow", function (evt) {
+            isViewRestored = evt.detail.isRestored;
             initTabs();
         });
-        view.addEventListener("viewshow", function (e__y) {
-            isViewRestored = e__y.detail.isRestored;
-
+        view.addEventListener("viewshow", function (evt) {
+            isViewRestored = evt.detail.isRestored;
             if (!isViewRestored) {
                 mainTabsManager.selectedTabIndex(initialTabIndex);
             }
-
             inputManager.on(window, onInputCommand);
         });
         view.addEventListener("viewbeforehide", function (e__u) {
             if (currentTabController && currentTabController.onHide) {
                 currentTabController.onHide();
             }
-
             document.body.classList.remove("autoScrollY");
             inputManager.off(window, onInputCommand);
         });
-        view.addEventListener("viewdestroy", function (e__i) {
-            tabControllers.forEach(function (t__o) {
-                if (t__o.destroy) {
-                    t__o.destroy();
+        view.addEventListener("viewdestroy", function (evt) {
+            tabControllers.forEach(function (tabController) {
+                if (tabController.destroy) {
+                    tabController.destroy();
                 }
             });
         });
diff --git a/src/scripts/plugincatalogpage.js b/src/scripts/plugincatalogpage.js
index bfbf4b2d12..4f08308b65 100644
--- a/src/scripts/plugincatalogpage.js
+++ b/src/scripts/plugincatalogpage.js
@@ -28,14 +28,10 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-linkbutton", "
         } else {
             if ("Theme" === category) {
                 category = "Themes";
-            } else {
-                if ("LiveTV" === category) {
-                    category = "HeaderLiveTV";
-                } else {
-                    if ("ScreenSaver" === category) {
-                        category = "HeaderScreenSavers";
-                    }
-                }
+            } else if ("LiveTV" === category) {
+                category = "HeaderLiveTV";
+            } else if ("ScreenSaver" === category) {
+                    category = "HeaderScreenSavers";
             }
         }
 
@@ -49,13 +45,13 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-linkbutton", "
     function populateListInternal(options) {
         var availablePlugins = options.availablePlugins;
         var installedPlugins = options.installedPlugins;
-        var allPlugins = availablePlugins.filter(function (p__w) {
-            p__w.category = p__w.category || "General";
-            p__w.categoryDisplayName = getHeaderText(p__w.category);
+        var allPlugins = availablePlugins.filter(function (plugin) {
+            plugin.category = plugin.category || "General";
+            plugin.categoryDisplayName = getHeaderText(plugin.category);
 
-            if (!options.categories || -1 != options.categories.indexOf(p__w.category)) {
-                if (!options.targetSystem || p__w.targetSystem == options.targetSystem) {
-                    return "UserInstalled" == p__w.type;
+            if (!options.categories || -1 != options.categories.indexOf(plugin.category)) {
+                if (!options.targetSystem || plugin.targetSystem == options.targetSystem) {
+                    return "UserInstalled" == plugin.type;
                 }
 
                 return false;