diff --git a/config/webpack/default.js b/config/webpack/default.js
index 1e7d558..f5c1c15 100644
--- a/config/webpack/default.js
+++ b/config/webpack/default.js
@@ -60,9 +60,8 @@ const defaultWebpackConfig = {
 
   sassLoader: {
     includePaths: [path.resolve(__dirname, '../node_modules')]
-  }
+  },
 
-  /*
   postcss (bundler) {
     return [
       require('postcss-import')({ addDependencyTo: bundler }),
@@ -70,7 +69,6 @@ const defaultWebpackConfig = {
       require('autoprefixer')({ browsers: AUTOPREFIXER_BROWSERS })
     ]
   }
-  */
 }
 
 export default defaultWebpackConfig
diff --git a/config/webpack/server.js b/config/webpack/server.js
index 8143d3e..7d0c15d 100644
--- a/config/webpack/server.js
+++ b/config/webpack/server.js
@@ -46,7 +46,6 @@ const serverConfig = {
     __dirname: false
   },
 
-
   plugins: [
     ...defaultConfig.plugins,
     new webpack.DefinePlugin({ ...config, 'process.env.BROWSER': false }),
diff --git a/src/client.js b/src/client.js
index b1cf921..7adf2d9 100644
--- a/src/client.js
+++ b/src/client.js
@@ -20,7 +20,6 @@ import configureStore from './store'
 // Styles.
 require('./styles/index.scss')
 
-
 // Configure store and browser-friendly history
 const store = configureStore(browserHistory, window.__INITIAL_STATE__)
 const history = syncHistoryWithStore(browserHistory, store)
@@ -34,7 +33,7 @@ const render = () => {
   // Render the client side react component.
   ReactDOM.render(
     <Provider store={store}>
-      <Router history={history} routes={routes}/>
+      <Router history={history} routes={routes} />
     </Provider>,
     document.getElementById('root')
   )
diff --git a/src/example/components/Layout.js b/src/example/components/Layout.js
index 8d18f21..b4a4b4d 100644
--- a/src/example/components/Layout.js
+++ b/src/example/components/Layout.js
@@ -8,7 +8,7 @@ class Layout extends React.Component {
         <nav className="navbar navbar-fixed-top navbar-light bg-faded">
           <div className="container">
             <IndexLink className="navbar-brand" to="/">
-              <i className="fa fa-code"/>
+              <i className="fa fa-code" />
               {' '}
               LeanJS
             </IndexLink>
diff --git a/src/example/components/ReadTheDocs.js b/src/example/components/ReadTheDocs.js
index 6d2b998..28ba956 100644
--- a/src/example/components/ReadTheDocs.js
+++ b/src/example/components/ReadTheDocs.js
@@ -10,7 +10,7 @@ class ReadTheDocs extends React.Component {
       >
         <i className="fa fa-book" />{' '}Read the docs
       </a>
-    );
+    )
   }
 }
 
diff --git a/src/routes.js b/src/routes.js
index 216c27b..53fa2b3 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,15 +1,15 @@
 import React from 'react'
-import { Router, Route, IndexRoute } from 'react-router'
+import { Route, IndexRoute } from 'react-router'
 import Layout from './example/components/Layout'
 import Home from './example/components/Home'
 import About from './example/components/About'
 
 export default (
   <Route path="/" component={Layout}>
-    <IndexRoute component={Home}/>
-    <Route path="about" component={About}/>
+    <IndexRoute component={Home} />
+    <Route path="about" component={About} />
   </Route>
-);
+)
 
 if (module.hot) {
   module.hot.accept()
diff --git a/src/server.js b/src/server.js
index dfa58be..e6f62ac 100644
--- a/src/server.js
+++ b/src/server.js
@@ -17,7 +17,6 @@ import routes from './routes'
 import configureStore from './store'
 import morgan from 'morgan'
 
-
 function renderElementWithState (store, element) {
   const innerHtml = ReactDOMServer.renderToString(element)
   const head = Helmet.rewind()
@@ -43,7 +42,6 @@ function renderElementWithState (store, element) {
 </html>`
 }
 
-
 /**
  * Create HTML from router props.
  */
@@ -59,8 +57,8 @@ function render (store, renderProps) {
 /**
  * Configure server
  */
-function createHandler (handler) {
-  handler = handler || new Express();
+function createHandler (baseHandler) {
+  const handler = baseHandler || new Express()
 
   handler.use(morgan('combined'))
   // Add production middlewares
@@ -77,7 +75,7 @@ function createHandler (handler) {
     const store = configureStore(memoryHistory)
     const history = syncHistoryWithStore(memoryHistory, store)
 
-    match({ history, routes: routes, location: req.url }, (error, redirectLocation, renderProps) => {
+    match({ history, routes, location: req.url }, (error, redirectLocation, renderProps) => {
       if (error) {
         res.status(500).send(error.message)
       } else if (redirectLocation) {
@@ -93,7 +91,6 @@ function createHandler (handler) {
   return handler
 }
 
-
 const defaultHandler = createHandler()
 
 /**
@@ -106,7 +103,7 @@ const defaultHandler = createHandler()
  */
 if (require.main === module) {
   require('http').createServer(defaultHandler).listen(config.PORT, () => {
-    console.log('[http] Listening to :' + config.PORT);
+    console.log(`[http] Server listening to :${config.PORT}`)  // eslint-disable-line no-console
   })
 }