diff --git a/background/storage.js b/background/storage.js
index 0791d6b3..00b4f392 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -189,7 +189,8 @@ function filterStylesInternal({
 
   const needSections = asHash || matchUrl !== null;
 
-  for (let i = 0, style; (style = styles[i]); i++) {
+  let style;
+  for (let i = 0; (style = styles[i]); i++) {
     if ((enabled === null || style.enabled == enabled)
     && (url === null || style.url == url)
     && (id === null || style.id == id)) {
@@ -230,7 +231,8 @@ function saveStyle(style) {
   if (!style.name) {
     delete style.name;
   }
-  let existed, codeIsUpdated;
+  let existed;
+  let codeIsUpdated;
   if (reason == 'update' || reason == 'update-digest') {
     return calcStyleDigest(style).then(digest => {
       style.originalDigest = digest;
diff --git a/edit/edit.js b/edit/edit.js
index 7e1d4856..6997f63c 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -602,8 +602,8 @@ function addSection(event, section) {
 }
 
 function removeAppliesTo(event) {
-  const appliesTo = event.target.parentNode,
-    appliesToList = appliesTo.parentNode;
+  const appliesTo = event.target.parentNode;
+  const appliesToList = appliesTo.parentNode;
   removeAreaAndSetDirty(appliesTo);
   if (!appliesToList.hasChildNodes()) {
     addAppliesTo(appliesToList);
@@ -744,7 +744,8 @@ function setupGlobalSearch() {
       && searchAppliesTo(activeCM)) {
       return;
     }
-    for (let i = 0, cm = activeCM; i < editors.length; i++) {
+    let cm = activeCM;
+    for (let i = 0; i < editors.length; i++) {
       state = updateState(cm);
       if (!cm.hasFocus()) {
         pos = reverse ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(0, 0);
@@ -799,7 +800,9 @@ function setupGlobalSearch() {
   }
 
   function replace(activeCM, all) {
-    let queue, query, replacement;
+    let queue;
+    let query;
+    let replacement;
     activeCM = focusClosestCM(activeCM);
     customizeOpenDialog(activeCM, template[all ? 'replaceAll' : 'replace'], function(txt) {
       query = txt;
diff --git a/vendor-overwrites/beautify/beautify-css-mod.js b/vendor-overwrites/beautify/beautify-css-mod.js
index b5baa1fd..a03fd7d8 100644
--- a/vendor-overwrites/beautify/beautify-css-mod.js
+++ b/vendor-overwrites/beautify/beautify-css-mod.js
@@ -364,7 +364,8 @@
                 }
             }
             outputPosCol = 0;
-            let i = output.length, token;
+            let i = output.length;
+            let token;
             while (--i >= 0 && (token = output[i]) != '\n') {
                 outputPosCol += token.length;
             }