diff --git a/.eslintrc b/.eslintrc
index 4586f62d..494ac522 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,34 +1,35 @@
 {
   "rules": {
+    "indent": [ 2, 2, { "VariableDeclarator": { "const": 3, "let": 2, "var": 2 } } ],
     "keyword-spacing": [ 2 ],
-    "object-curly-spacing": [ 2, "always"],
-    "space-before-blocks": [ 2, "always"],
-    "indent": [ 2, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 } } ],
-    "no-unused-vars": [ 2, { "args": "none" } ],
-    "space-before-function-paren": [ 2, "never" ],
-    "quotes": [ 2, "single" ],
-    "semi": [ 2, "always" ],
+    "mocha/no-exclusive-tests": 2,
     "no-console": 0,
-    "mocha/no-exclusive-tests": 2
+    "no-unused-vars": [ 2, { "args": "none" } ],
+    "no-trailing-spaces": [ 2 ],
+    "object-curly-spacing": [ 2, "always"],
+    "semi": [ 2, "always" ],
+    "space-before-blocks": [ 2, "always"],
+    "space-before-function-paren": [ 2, "never" ],
+    "quotes": [ 2, "single" ]
   },
   "env": {
-    "node": true,
-    "browser": true
+    "browser": true,
+    "node": true
   },
   "extends": "eslint:recommended",
   "parserOptions": {
-    "sourceType": "module"
+    "ecmaVersion": 5
   },
   "plugins": [
     "mocha"
   ],
   "globals": {
-    "expect": false,
-    "it": false,
-    "describe": false,
-    "beforeEach": true,
+    "after": true,
     "afterEach": true,
     "before": true,
-    "after": true
+    "beforeEach": true,
+    "describe": false,
+    "expect": false,
+    "it": false
   }
 }
\ No newline at end of file
diff --git a/lib/features/distribute-elements/BpmnDistributeElements.js b/lib/features/distribute-elements/BpmnDistributeElements.js
index 0a0a63d4..15641759 100644
--- a/lib/features/distribute-elements/BpmnDistributeElements.js
+++ b/lib/features/distribute-elements/BpmnDistributeElements.js
@@ -5,8 +5,8 @@ var filter = require('lodash/collection/filter');
 var isAny = require('../modeling/util/ModelingUtil').isAny;
 
 /**
- * Registers element exclude filters for elements that currently do 
- * not support distribution.
+ * Registers element exclude filters for elements that
+ * currently do not support distribution.
  */
 function BpmnDistributeElements(distributeElements) {