diff --git a/.eslintrc b/.eslintrc
index 6e5a675e8..1f5fa2374 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -17,6 +17,7 @@
     "rules": {
         "accessor-pairs": "error",
         "arrow-spacing": "warn",
+        "block-scoped-var": "error",
         "class-methods-use-this": "error",
         "complexity": ["warn", 50],
         "default-case-last": "error",
diff --git a/modules/actions/add_member.js b/modules/actions/add_member.js
index f36104e8d..d7e8867b2 100644
--- a/modules/actions/add_member.js
+++ b/modules/actions/add_member.js
@@ -169,7 +169,8 @@ export function actionAddMember(relationId, member, memberIndex, insertPair) {
         // members       0 1 2 3 x 5 4 7 6 x 8 9    keep 6 in j+k
         //
         function moveMember(arr, findIndex, toIndex) {
-            for (var i = 0; i < arr.length; i++) {
+            var i;
+            for (i = 0; i < arr.length; i++) {
                 if (arr[i].index === findIndex) {
                     break;
                 }
diff --git a/modules/actions/circularize.js b/modules/actions/circularize.js
index 0952a653a..cf3491188 100644
--- a/modules/actions/circularize.js
+++ b/modules/actions/circularize.js
@@ -242,9 +242,11 @@ export function actionCircularize(wayId, projection, maxAngle) {
         var centroid = d3_polygonCentroid(points);
         var radius = geoVecLengthSquare(centroid, points[0]);
 
+        var i, actualPoint;
+
         // compare distances between centroid and points
-        for (var i = 0; i<hull.length; i++){
-            var actualPoint = hull[i];
+        for (i = 0; i < hull.length; i++){
+            actualPoint = hull[i];
             var actualDist = geoVecLengthSquare(actualPoint, centroid);
             var diff = Math.abs(actualDist - radius);
             //compare distances with epsilon-error (5%)
@@ -254,7 +256,7 @@ export function actionCircularize(wayId, projection, maxAngle) {
         }
 
         //check if central angles are smaller than maxAngle
-        for (i = 0; i<hull.length; i++){
+        for (i = 0; i < hull.length; i++){
             actualPoint = hull[i];
             var nextPoint = hull[(i+1)%hull.length];
             var startAngle = Math.atan2(actualPoint[1] - centroid[1], actualPoint[0] - centroid[0]);
diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index b5013e7ca..92ea7c285 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -190,16 +190,17 @@ export function modeDragNode(context) {
         var currMouse = geoVecSubtract(currPoint, nudge);
         var loc = context.projection.invert(currMouse);
 
+        var target, edge;
+
         if (!_nudgeInterval) {   // If not nudging at the edge of the viewport, try to snap..
             // related code
             // - `mode/drag_node.js`     `doMove()`
             // - `behavior/draw.js`      `click()`
             // - `behavior/draw_way.js`  `move()`
             var d = datum(d3_event);
-            var target = d && d.properties && d.properties.entity;
+            target = d && d.properties && d.properties.entity;
             var targetLoc = target && target.loc;
             var targetNodes = d && d.properties && d.properties.nodes;
-            var edge;
 
             if (targetLoc) {   // snap to node/vertex - a point target with `.loc`
                 if (shouldSnapToNode(target)) {
diff --git a/modules/services/vector_tile.js b/modules/services/vector_tile.js
index e818f8535..71e40a962 100644
--- a/modules/services/vector_tile.js
+++ b/modules/services/vector_tile.js
@@ -40,9 +40,10 @@ function vtToGeoJSON(data, tile, mergeCache) {
                     geometry.coordinates = [geometry.coordinates];
                 }
 
+                var isClipped = false;
+
                 // Clip to tile bounds
                 if (geometry.type === 'MultiPolygon') {
-                    var isClipped = false;
                     var featureClip = turf_bboxClip(feature, tile.extent.rectangle());
                     if (!deepEqual(feature.geometry, featureClip.geometry)) {
                         // feature = featureClip;
diff --git a/modules/ui/fields/restrictions.js b/modules/ui/fields/restrictions.js
index a31421ebd..d3a82e0f6 100644
--- a/modules/ui/fields/restrictions.js
+++ b/modules/ui/fields/restrictions.js
@@ -289,8 +289,9 @@ export function uiFieldRestrictions(field, context) {
             .selectAll('.related')
             .classed('related', false);
 
+        var way;
         if (_fromWayID) {
-            var way = vgraph.entity(_fromWayID);
+            way = vgraph.entity(_fromWayID);
             surface
                 .selectAll('.' + _fromWayID)
                 .classed('selected', true)
diff --git a/modules/util/util.js b/modules/util/util.js
index a36a4dee1..37f7f5777 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -418,8 +418,9 @@ export function utilEditDistance(a, b) {
     if (a.length === 0) return b.length;
     if (b.length === 0) return a.length;
     var matrix = [];
-    for (var i = 0; i <= b.length; i++) { matrix[i] = [i]; }
-    for (var j = 0; j <= a.length; j++) { matrix[0][j] = j; }
+    var i, j;
+    for (i = 0; i <= b.length; i++) { matrix[i] = [i]; }
+    for (j = 0; j <= a.length; j++) { matrix[0][j] = j; }
     for (i = 1; i <= b.length; i++) {
         for (j = 1; j <= a.length; j++) {
             if (b.charAt(i-1) === a.charAt(j-1)) {