diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js
index 73cef50a..9cc829e4 100644
--- a/lib/ace/edit_session/folding.js
+++ b/lib/ace/edit_session/folding.js
@@ -569,7 +569,8 @@ function Folding() {
         var iterator = new TokenIterator(this, row, column);
         var token = iterator.getCurrentToken();
         if (token && /^comment|string/.test(token.type)) {
-            var range = new Range;
+            var range = new Range();
+            var t;
             do {
                 t = iterator.stepBackward();
             } while(t && t.type == token.type)
@@ -656,7 +657,7 @@ function Folding() {
             return;
         }
 
-        range = this.getFoldWidgetRange(row);
+        var range = this.getFoldWidgetRange(row);
         if (range)
             this.addFold("...", range);
     }
@@ -713,7 +714,7 @@ Folding.commonFoldingRules = {
         }
 
         if (endRow > startRow) {
-            endColumn = this.getLine(endRow).length;
+            var endColumn = this.getLine(endRow).length;
             return new Range(startRow, startColumn, endRow, endColumn);
         }
     },
diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js
index ae3e8530..06242c73 100644
--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@@ -127,9 +127,9 @@ var Gutter = function(parentEl) {
 
             if (foldWidgets) {
                 var c = foldWidgets[i];
-                if (c == null)
+                if (!c)
                     c = foldWidgets[i] = this.session.getFoldWidget(i);
-                if(c)
+                if (c)
                     html.push(
                         "<span class='ace_fold-widget ", c,
                         c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open",