diff --git a/client/.eslintrc b/client/.eslintrc
index 8923c8db2..40a61398c 100644
--- a/client/.eslintrc
+++ b/client/.eslintrc
@@ -37,7 +37,6 @@
     "react/sort-comp": 0,
     "react/prop-types": 0,
 
-    "function-paren-newline": 0,
     "jsx-a11y/anchor-is-valid": 0,
     "jsx-a11y/click-events-have-key-events": 0,
     "jsx-a11y/label-has-for": 0,
@@ -52,6 +51,5 @@
     "react/jsx-closing-tag-location": 0,
     "react/jsx-max-props-per-line": 0,
     "react/jsx-wrap-multilines": 0,
-    "spaced-comment": 0,
   }
 }
diff --git a/client/app/scripts/utils/data-generator-utils.js b/client/app/scripts/utils/data-generator-utils.js
index 68a520cfe..8ecd10b20 100644
--- a/client/app/scripts/utils/data-generator-utils.js
+++ b/client/app/scripts/utils/data-generator-utils.js
@@ -3,7 +3,7 @@ import { scaleLinear } from 'd3-scale';
 import { extent } from 'd3-array';
 
 // Inspired by Lee Byron's test data generator.
-/*eslint-disable */
+/* eslint-disable */
 function bumpLayer(n, maxValue) {
   function bump(a) {
     const x = 1 / (0.1 + Math.random());
@@ -23,7 +23,7 @@ function bumpLayer(n, maxValue) {
   const s = scaleLinear().domain(extent(values)).range([0, maxValue]);
   return values.map(s);
 }
-/*eslint-enable */
+/* eslint-enable */
 
 
 const nodeData = {};
diff --git a/client/server.js b/client/server.js
index 886500ad5..d9557a41e 100644
--- a/client/server.js
+++ b/client/server.js
@@ -8,12 +8,12 @@ const app = express();
 
 const BACKEND_HOST = process.env.BACKEND_HOST || 'localhost';
 
-/**
- *
- * Proxy requests to:
- *   - /api -> :4040/api
- *
- ************************************************************/
+/*
+*
+* Proxy requests to:
+*   - /api -> :4040/api
+*
+*/
 
 const backendProxy = httpProxy.createProxy({
   ws: true,
@@ -22,24 +22,24 @@ const backendProxy = httpProxy.createProxy({
 backendProxy.on('error', err => console.error('Proxy error', err));
 app.all('/api*', backendProxy.web.bind(backendProxy));
 
-/**
- *
- * Production env serves precompiled content from build/
- *
- ************************************************************/
+/*
+*
+* Production env serves precompiled content from build/
+*
+*/
 
 if (process.env.NODE_ENV === 'production') {
   app.use(express.static('build'));
 }
 
-/**
- *
- * Webpack Dev Middleware with Hot Reload
- *
- * See: https://github.com/webpack/webpack-dev-middleware;
- *      https://github.com/glenjamin/webpack-hot-middleware
- *
- *************************************************************/
+/*
+*
+* Webpack Dev Middleware with Hot Reload
+*
+* See: https://github.com/webpack/webpack-dev-middleware;
+*      https://github.com/glenjamin/webpack-hot-middleware
+*
+*/
 
 if (process.env.NODE_ENV !== 'production') {
   const webpack = require('webpack');
@@ -60,11 +60,11 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 
-/**
- *
- * Express server
- *
- *****************/
+/*
+*
+* Express server
+*
+*/
 
 const port = process.env.PORT || 4042;
 const server = app.listen(port, 'localhost', () => {
@@ -76,11 +76,11 @@ const server = app.listen(port, 'localhost', () => {
 server.on('upgrade', backendProxy.ws.bind(backendProxy));
 
 
-/**
- *
- * Path proxy server
- *
- *************************************************************/
+/*
+*
+* Path proxy server
+*
+*/
 
 const proxyRules = new HttpProxyRules({
   rules: {