diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index eed69ec4..f3a163e5 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -75,7 +75,7 @@ var Mode = function(name, desc, extensions) {
     this.name = name;
     this.desc = desc;
     this.mode = "ace/mode/" + name;
-    this.extRe = new RegExp("^.*\\.(" + extensions + ")$"      , "g");
+    this.extRe = new RegExp("^.*\\.(" + extensions + ")$", "g");
 };
 
 Mode.prototype.supportsFile = function(filename) {
@@ -236,7 +236,7 @@ function prepareDocList(docs) {
             doc = {name: doc || path};
 
         doc.path = path;
-        doc.desc = doc.name.replace(/^(ace|docs|demo|build)\//      , "");
+        doc.desc = doc.name.replace(/^(ace|docs|demo|build)\//, "");
         if (doc.desc.length > 18)
             doc.desc = doc.desc.slice(0, 7) + ".." + doc.desc.slice(-9)
 
@@ -325,7 +325,7 @@ cmdLine.commands.bindKeys({
     },
 })
 
-cmdLine.commands.removeCommands(["find"      , "gotoline"      , "findall"      , "replace"      , "replaceall"])
+cmdLine.commands.removeCommands(["find", "gotoline", "findall", "replace", "replaceall"])
 
 /**
  * This demonstrates how you can define commands and bind shortcuts to them.
@@ -389,15 +389,15 @@ var softTabEl = document.getElementById("soft_tab");
 var behavioursEl = document.getElementById("enable_behaviours");
 
 var group = document.createElement("optgroup");
-group.setAttribute("label"      , "Mode Examples");
+group.setAttribute("label", "Mode Examples");
 fillDropdown(docs, group);
 docEl.appendChild(group);
 var group = document.createElement("optgroup");
-group.setAttribute("label"      , "Huge documents");
+group.setAttribute("label", "Huge documents");
 fillDropdown(hugeDocs, group);
 docEl.appendChild(group);
 var group = document.createElement("optgroup");
-group.setAttribute("label"      , "own source");
+group.setAttribute("label", "own source");
 fillDropdown(ownSource, group);
 docEl.appendChild(group);
 
@@ -479,13 +479,13 @@ function saveOption(el, val) {
     }
 }
 
-event.addListener(themeEl      , "mouseover", function(e){
+event.addListener(themeEl, "mouseover", function(e){
     this.desiredValue = e.target.value;
     if (!this.$timer)
         this.$timer = setTimeout(this.updateTheme);
 })
 
-event.addListener(themeEl      , "mouseout", function(e){
+event.addListener(themeEl, "mouseout", function(e){
     this.desiredValue = null;
     if (!this.$timer)
         this.$timer = setTimeout(this.updateTheme, 20);
@@ -653,11 +653,11 @@ function fillDropdown(list, el) {
 
 
 /************** dragover ***************************/
-event.addListener(container      , "dragover", function(e) {
+event.addListener(container, "dragover", function(e) {
     return event.preventDefault(e);
 });
 
-event.addListener(container      , "drop", function(e) {
+event.addListener(container, "drop", function(e) {
     var file;
     try {
         file = e.dataTransfer.files[0];
@@ -753,7 +753,7 @@ var statusUpdate = lang.deferredCall(function() {
         add("REC");
     
     var c = editor.selection.lead;
-    add(c.row + ":" + c.column      , " ");
+    add(c.row + ":" + c.column, " ");
     if (!editor.selection.isEmpty()) {
         var r = editor.getSelectionRange()
         add("(" + (r.end.row - r.start.row) + ":"  +(r.end.column - r.start.column) + ")");
diff --git a/tool/theme.tmpl.js b/tool/theme.tmpl.js
index 0d980a3a..dfaf0bf5 100644
--- a/tool/theme.tmpl.js
+++ b/tool/theme.tmpl.js
@@ -34,6 +34,6 @@ exports.isDark = %isDark%;
 exports.cssClass = "%cssClass%";
 exports.cssText = %css%;
 
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass);
 });
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index 3d2e0050..bc334843 100755
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -7,8 +7,6 @@ function parseTheme(themeXml, callback) {
 	});
 }
 
-
-
 var supportedScopes = {
    "keyword": "keyword",
    "keyword.operator": "keyword.operator",