diff --git a/.eslintrc b/.eslintrc
index eb00225c8..825af5b7f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,6 +24,7 @@
                 "ignoredNodes": ["ConditionalExpression"]
             }
         ],
+        "keyword-spacing": ["error"],
         "linebreak-style": ["error", "unix"],
         "max-len": [
             "error",
diff --git a/blocks/variables.js b/blocks/variables.js
index 5cfa0d0b5..38038f164 100644
--- a/blocks/variables.js
+++ b/blocks/variables.js
@@ -103,7 +103,7 @@ Blockly.Constants.Variables.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MIXIN = {
    * @this Blockly.Block
    */
   customContextMenu: function(options) {
-    if(this.isInFlyout){
+    if (this.isInFlyout){
       return;
     }
     // Getter blocks have the option to create a setter block, and vice versa.
diff --git a/core/block.js b/core/block.js
index 7dc0485dd..76b45ca03 100644
--- a/core/block.js
+++ b/core/block.js
@@ -1197,7 +1197,7 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) {
       }
     }
   }
-  if(indexCount != args.length) {
+  if (indexCount != args.length) {
     throw new Error('Block "' + this.type + '": ' +
         'Message does not reference all ' + args.length + ' arg(s).');
   }
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 9c5485bbb..0924412b7 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -611,7 +611,7 @@ Blockly.Flyout.prototype.createBlock = function(originalBlock) {
     Blockly.Events.setGroup(true);
     Blockly.Events.fire(new Blockly.Events.Create(newBlock));
     // Fire a VarCreate event for each (if any) new variable created.
-    for(var i = 0; i < newVariables.length; i++) {
+    for (var i = 0; i < newVariables.length; i++) {
       var thisVariable = newVariables[i];
       Blockly.Events.fire(new Blockly.Events.VarCreate(thisVariable));
     }
diff --git a/core/xml.js b/core/xml.js
index e899060ce..5ac15c38f 100644
--- a/core/xml.js
+++ b/core/xml.js
@@ -549,7 +549,7 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
     var newVariables = Blockly.Variables.getAddedVariables(workspace,
         variablesBeforeCreation);
     // Fire a VarCreate event for each (if any) new variable created.
-    for(var i = 0; i < newVariables.length; i++) {
+    for (var i = 0; i < newVariables.length; i++) {
       var thisVariable = newVariables[i];
       Blockly.Events.fire(new Blockly.Events.VarCreate(thisVariable));
     }