diff --git a/src/components/accessschedule/accessschedule.js b/src/components/accessschedule/accessschedule.js
index 870231cf03..caf3e82045 100644
--- a/src/components/accessschedule/accessschedule.js
+++ b/src/components/accessschedule/accessschedule.js
@@ -72,12 +72,12 @@ define(['dialogHelper', 'datetime', 'globalize', 'emby-select', 'paper-icon-butt
                             reject();
                         }
                     });
-                    dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
+                    dlg.querySelector('.btnCancel').addEventListener('click', function () {
                         dialogHelper.close(dlg);
                     });
-                    dlg.querySelector('form').addEventListener('submit', function (e) {
+                    dlg.querySelector('form').addEventListener('submit', function (event) {
                         submitSchedule(dlg, options);
-                        e.preventDefault();
+                        event.preventDefault();
                         return false;
                     });
                 };
diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionsheet/actionsheet.js
index e08fbf4a25..ab8998f1bc 100644
--- a/src/components/actionsheet/actionsheet.js
+++ b/src/components/actionsheet/actionsheet.js
@@ -11,20 +11,10 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
         }
 
         var box;
-        var elem;
+        for (let [index, elem] of elems) {
+            box = elem.getBoundingClientRect();
 
-        for (var i = 0, length = elems.length; i < length; i++) {
-
-            elem = elems[i];
-            // Support: BlackBerry 5, iOS 3 (original iPhone)
-            // If we don't have gBCR, just use 0,0 rather than error
-            if (elem.getBoundingClientRect) {
-                box = elem.getBoundingClientRect();
-            } else {
-                box = { top: 0, left: 0 };
-            }
-
-            results[i] = {
+            results[index] = {
                 top: box.top,
                 left: box.left,
                 width: box.width,
@@ -96,13 +86,11 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             scrollY: false
         };
 
-        var backButton = false;
         var isFullscreen;
 
         if (layoutManager.tv) {
             dialogOptions.size = 'fullscreen';
             isFullscreen = true;
-            backButton = true;
             dialogOptions.autoFocus = true;
         } else {
 
@@ -139,16 +127,10 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             style += 'min-width:' + minWidth + 'px;';
         }
 
-        var i;
-        var length;
-        var option;
         var renderIcon = false;
         var icons = [];
         var itemIcon;
-        for (i = 0, length = options.items.length; i < length; i++) {
-
-            option = options.items[i];
-
+        for (let option of options.items) {
             itemIcon = option.icon || (option.selected ? 'check' : null);
 
             if (itemIcon) {
@@ -206,10 +188,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             menuItemClass += ' actionsheet-xlargeFont';
         }
 
-        for (i = 0, length = options.items.length; i < length; i++) {
-
-            option = options.items[i];
-
+        for (let [index, option] of options) {
             if (option.divider) {
 
                 html += '<div class="actionsheetDivider"></div>';
@@ -222,7 +201,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             var optionId = option.id == null || option.id === '' ? option.value : option.id;
             html += '<button' + autoFocus + ' is="emby-button" type="button" class="' + menuItemClass + '" data-id="' + optionId + '">';
 
-            itemIcon = icons[i];
+            itemIcon = icons[index];
 
             if (itemIcon) {
 
diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index a7b3f48bc2..bbb0995063 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -34,10 +34,14 @@ define(['events', 'globalize', 'dom', 'date-fns', 'dfnshelper', 'userSettings',
         html += '</div>';
 
         if (entry.Overview) {
-            html += '<button type="button" is="paper-icon-button-light" class="btnEntryInfo" data-id="' + entry.Id + '" title="' + globalize.translate('Info') + '"><span class="material-icons info"></span></button>';
+            html += `<button type="button" is="paper-icon-button-light" class="btnEntryInfo" data-id="${entry.Id}" title="${globalize.translate('Info')}">
+                       <span class="material-icons info"></span>
+                    </button>`;
         }
 
-        return html += '</div>';
+        html += '</div>';
+
+        return html;
     }
 
     function renderList(elem, apiClient, result, startIndex, limit) {
diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index 2e11ef88d9..77b64f8e88 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -26,11 +26,11 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
         connectionManager.connect({
             enableAutoLogin: appSettings.enableAutoLogin()
         }).then(function (result) {
-            handleConnectionResult(result, loading);
+            handleConnectionResult(result);
         });
     }
 
-    function handleConnectionResult(result, loading) {
+    function handleConnectionResult(result) {
         switch (result.State) {
             case 'SignedIn':
                 loading.hide();
@@ -246,13 +246,11 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
         }
 
         if (setQuality) {
-
-            var quality = 100;
-
+            var quality;
             var type = options.type || 'Primary';
 
             if (browser.tv || browser.slow) {
-
+                // TODO: wtf
                 if (browser.chrome) {
                     // webp support
                     quality = type === 'Primary' ? 40 : 50;
@@ -384,7 +382,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
 
             if (firstResult.State !== 'SignedIn' && !route.anonymous) {
 
-                handleConnectionResult(firstResult, loading);
+                handleConnectionResult(firstResult);
                 return;
             }
         }
@@ -463,7 +461,6 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
         return Promise.resolve();
     }
 
-    var isHandlingBackToDefault;
     var isDummyBackToHome;
 
     function loadContent(ctx, route, html, request) {
@@ -589,8 +586,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
             path = '/' + path;
         }
 
-        var baseRoute = baseUrl();
-        path = path.replace(baseRoute, '');
+        path = path.replace(baseUrl(), '');
 
         if (currentRouteInfo && currentRouteInfo.path === path) {
             // can't use this with home right now due to the back menu
@@ -621,10 +617,11 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
     }
 
     function showItem(item, serverId, options) {
+        // TODO: Refactor this so it only gets items, not strings.
         if (typeof (item) === 'string') {
             var apiClient = serverId ? connectionManager.getApiClient(serverId) : connectionManager.currentApiClient();
-            apiClient.getItem(apiClient.getCurrentUserId(), item).then(function (item) {
-                appRouter.showItem(item, options);
+            apiClient.getItem(apiClient.getCurrentUserId(), item).then(function (itemObject) {
+                appRouter.showItem(itemObject, options);
             });
         } else {
             if (arguments.length === 2) {