diff --git a/.eslintrc b/.eslintrc
index 855b16e0d6..5e669cf274 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,7 +2,7 @@
   "parserOption": {
     "ecmaVersion": 6,
     "ecmaFeatures": {
-        "jsx": true
+      "jsx": true
     }
   },
   "env": {
@@ -36,232 +36,170 @@
     "router": true
   },
   "rules": {
+    "block-scoped-var": 0,
+    "brace-style": [ 2, "1tbs", { "allowSingleLine": true } ],
+    "camelcase": 2,
     "comma-dangle": 2,
+    "comma-spacing": [ 2, { "before": false, "after": true } ],
+    "comma-style": [ 2, "last" ],
+    "complexity": 0,
+    "consistent-return": 2,
+    "consistent-this": 0,
+    "curly": 2,
+    "default-case": 2,
+    "dot-notation": 0,
+    "eol-last": 2,
+    "eqeqeq": 2,
+    "func-names": 0,
+    "func-style": 0,
+    "guard-for-in": 2,
+    "handle-callback-err": 2,
+    "jsx-quotes": [ 2, "prefer-single" ],
+    "key-spacing": [ 2, { "beforeColon": false, "afterColon": true } ],
+    "keyword-spacing": [ 2 ],
+    "max-depth": 0,
+    "max-len": [ 2, 80, 2 ],
+    "max-nested-callbacks": 0,
+    "max-params": 0,
+    "max-statements": 0,
+    "new-cap": 0,
+    "new-parens": 2,
+    "no-alert": 2,
+    "no-array-constructor": 2,
+    "no-bitwise": 2,
+    "no-caller": 2,
+    "no-catch-shadow": 2,
     "no-cond-assign": 2,
     "no-console": 0,
     "no-constant-condition": 2,
     "no-control-regex": 2,
     "no-debugger": 2,
+    "no-delete-var": 2,
+    "no-div-regex": 2,
     "no-dupe-keys": 2,
+    "no-else-return": 0,
     "no-empty": 2,
     "no-empty-character-class": 2,
+    "no-eq-null": 2,
+    "no-eval": 2,
     "no-ex-assign": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
     "no-extra-boolean-cast": 2,
     "no-extra-parens": 0,
     "no-extra-semi": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
     "no-func-assign": 2,
+    "no-implied-eval": 2,
+    "no-inline-comments": 2,
     "no-inner-declarations": 2,
     "no-invalid-regexp": 2,
     "no-irregular-whitespace": 2,
-    "no-negated-in-lhs": 2,
-    "no-obj-calls": 2,
-    "no-regex-spaces": 2,
-    "no-reserved-keys": 0,
-    "no-sparse-arrays": 2,
-    "no-unreachable": 2,
-    "use-isnan": 2,
-    "valid-jsdoc": 2,
-    "valid-typeof": 2,
-
-    "block-scoped-var": 0,
-    "complexity": 0,
-    "consistent-return": 2,
-    "curly": 2,
-    "default-case": 2,
-    "dot-notation": 0,
-    "eqeqeq": 2,
-    "guard-for-in": 2,
-    "no-alert": 2,
-    "no-caller": 2,
-    "no-div-regex": 2,
-    "no-else-return": 0,
-    "no-eq-null": 2,
-    "no-eval": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-implied-eval": 2,
     "no-iterator": 2,
+    "no-label-var": 2,
     "no-labels": 2,
     "no-lone-blocks": 2,
+    "no-lonely-if": 2,
     "no-loop-func": 2,
+    "no-mixed-requires": 0,
+    "no-mixed-spaces-and-tabs": 2,
     "no-multi-spaces": 2,
     "no-multi-str": 2,
+    "no-multiple-empty-lines": [ 2, { "max": 2 } ],
     "no-native-reassign": 2,
+    "no-negated-in-lhs": 2,
+    "no-nested-ternary": 2,
     "no-new": 2,
     "no-new-func": 2,
+    "no-new-object": 2,
+    "no-new-require": 2,
     "no-new-wrappers": 2,
+    "no-obj-calls": 2,
     "no-octal": 2,
     "no-octal-escape": 2,
+    "no-path-concat": 2,
+    "no-plusplus": 0,
     "no-process-env": 0,
+    "no-process-exit": 2,
     "no-proto": 2,
     "no-redeclare": 2,
+    "no-regex-spaces": 2,
+    "no-reserved-keys": 0,
+    "no-restricted-modules": 0,
     "no-return-assign": 2,
     "no-script-url": 2,
     "no-self-compare": 2,
     "no-sequences": 2,
-    "no-unused-expressions": 2,
-    "no-void": 2,
-    "no-warning-comments": [
-      2,
-      {
-        "terms": [
-          "fixme"
-        ],
-        "location": "start"
-      }
-    ],
-    "no-with": 2,
-    "radix": 2,
-    "vars-on-top": 0,
-    "wrap-iife": [2, "any"],
-    "yoda": 0,
-
-    "strict": 0,
-
-    "no-catch-shadow": 2,
-    "no-delete-var": 2,
-    "no-label-var": 2,
     "no-shadow": 0,
     "no-shadow-restricted-names": 2,
+    "no-spaced-func": 2,
+    "no-sparse-arrays": 2,
+    "no-sync": 0,
+    "no-ternary": 0,
+    "no-trailing-spaces": 2,
     "no-undef": 2,
     "no-undef-init": 2,
     "no-undefined": 2,
+    "no-underscore-dangle": 0,
+    "no-unreachable": 2,
+    "no-unused-expressions": 2,
     "no-unused-vars": 2,
     "no-use-before-define": 0,
-
-    "handle-callback-err": 2,
-    "no-mixed-requires": 0,
-    "no-new-require": 2,
-    "no-path-concat": 2,
-    "no-process-exit": 2,
-    "no-restricted-modules": 0,
-    "no-sync": 0,
-
-    "brace-style": [
-      2,
-      "1tbs",
-      { "allowSingleLine": true }
-    ],
-    "camelcase": 2,
-    "comma-spacing": [
-      2,
-      {
-        "before": false,
-        "after": true
-      }
-    ],
-    "comma-style": [
-      2, "last"
-    ],
-    "consistent-this": 0,
-    "eol-last": 2,
-    "func-names": 0,
-    "func-style": 0,
-    "key-spacing": [
-      2,
-      {
-        "beforeColon": false,
-        "afterColon": true
-      }
-    ],
-    "max-nested-callbacks": 0,
-    "new-cap": 0,
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-inline-comments": 2,
-    "no-lonely-if": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multiple-empty-lines": [
-      2,
-      { "max": 2 }
-    ],
-    "no-nested-ternary": 2,
-    "no-new-object": 2,
-    "semi-spacing": [2, { "before": false, "after": true }],
-    "no-spaced-func": 2,
-    "no-ternary": 0,
-    "no-trailing-spaces": 2,
-    "no-underscore-dangle": 0,
+    "no-void": 2,
+    "no-warning-comments": [ 2, { "terms": [ "fixme" ], "location": "start" } ],
+    "no-with": 2,
     "one-var": 0,
     "operator-assignment": 0,
     "padded-blocks": 0,
-    "quote-props": [2, "as-needed"],
-    "quotes": [
-      2,
-      "single",
-      "avoid-escape"
-    ],
-    "semi": [
-      2,
-      "always"
-    ],
+    "quote-props": [ 2, "as-needed" ],
+    "quotes": [ 2, "single", "avoid-escape" ],
+    "radix": 2,
+    "semi": [ 2, "always" ],
+    "semi-spacing": [ 2, { "before": false, "after": true } ],
     "sort-vars": 0,
-    "keyword-spacing": [ 2 ],
-    "space-before-function-paren": [
-      2,
-      "never"
-    ],
-    "space-before-blocks": [
-      2,
-      "always"
-    ],
+    "space-before-blocks": [ 2, "always" ],
+    "space-before-function-paren": [ 2, "never" ],
     "space-in-brackets": 0,
     "space-in-parens": 0,
     "space-infix-ops": 2,
-    "space-unary-ops": [
-      2,
-      {
-        "words": true,
-        "nonwords": false
-      }
-    ],
-    "spaced-comment": [
-      2,
-      "always",
-      { "exceptions": ["-"] }
-    ],
+    "space-unary-ops": [ 2, { "words": true, "nonwords": false } ],
+    "spaced-comment": [ 2, "always", { "exceptions": [ "-" ] } ],
+    "strict": 0,
+    "use-isnan": 2,
+    "valid-jsdoc": 2,
+    "valid-typeof": 2,
+    "vars-on-top": 0,
+    "wrap-iife": [ 2, "any" ],
     "wrap-regex": 2,
+    "yoda": 0,
 
-    "max-depth": 0,
-    "max-len": [
-      2,
-      80,
-      2
-    ],
-    "max-params": 0,
-    "max-statements": 0,
-    "no-bitwise": 2,
-    "no-plusplus": 0,
-
-    "jsx-quotes": [2, "prefer-single"],
     "react/display-name": 2,
-    "react/no-did-mount-set-state": 2,
-    "react/no-did-update-set-state": 2,
-    "react/no-multi-comp": [2, { "ignoreStateless": true } ],
-    "react/prop-types": 2,
-    "react/react-in-jsx-scope": 2,
-    "react/self-closing-comp": 2,
-    "react/no-unknown-property": 2,
-    "react/jsx-boolean-value": [2, "always"],
+    "react/jsx-boolean-value": [ 2, "always" ],
+    "react/jsx-closing-bracket-location": [ 2, { "selfClosing": "line-aligned", "nonEmpty": "props-aligned" } ],
     "react/jsx-no-undef": 2,
-    "react/jsx-sort-props": [2, { "ignoreCase": true }],
+    "react/jsx-sort-props": [ 2, { "ignoreCase": true } ],
     "react/jsx-uses-react": 2,
     "react/jsx-uses-vars": 2,
     "react/jsx-wrap-multilines": 2,
-    "react/jsx-closing-bracket-location": [ 2, { "selfClosing": "line-aligned", "nonEmpty": "props-aligned" } ],
+    "react/no-did-mount-set-state": 2,
+    "react/no-did-update-set-state": 2,
+    "react/no-multi-comp": [ 2, { "ignoreStateless": true } ],
+    "react/no-unknown-property": 2,
+    "react/prop-types": 2,
+    "react/react-in-jsx-scope": 2,
+    "react/self-closing-comp": 2,
 
-    "import/no-unresolved": 2,
-    "import/named": 2,
-    "import/namespace": 2,
     "import/default": 2,
     "import/export": 2,
-    "import/first": 2,
-    "import/no-duplicates": 2,
-    "import/newline-after-import": 2,
-    "import/unambiguous": 2,
     "import/extensions": [ 0, "always" ],
+    "import/first": 2,
+    "import/named": 2,
+    "import/namespace": 2,
+    "import/newline-after-import": 2,
+    "import/no-duplicates": 2,
+    "import/no-unresolved": 2,
+    "import/unambiguous": 2,
 
     "prefer-object-spread/prefer-object-spread": 2
   }