diff --git a/src/actions.js b/src/actions.js
index ea49772..64e85ec 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1,8 +1,8 @@
 export default  {
     countIncrease (){
-        return {type: 'COUNT_INC'};
+        return { type: 'COUNT_INC' }
     },
     countDecrease (){
-        return {type: 'COUNT_DEC'};
+        return { type: 'COUNT_DEC' }
     }
-};
\ No newline at end of file
+}
diff --git a/src/app.js b/src/app.js
index d70f2e4..d555ac2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -6,8 +6,8 @@ import routes from './routes'
 import store from './store'
 
 ReactDom.render(
-    <Provider store={store}>
-        <Router routes={routes}/>
+    <Provider store={ store }>
+        <Router routes={ routes }/>
     </Provider>,
     document.getElementById('app')
-);
\ No newline at end of file
+)
diff --git a/src/components/count.js b/src/components/count.js
index a902d86..d5fa15a 100644
--- a/src/components/count.js
+++ b/src/components/count.js
@@ -1,39 +1,38 @@
-import React, { Component, PropTypes } from 'react'
+import React, { PropTypes } from 'react'
 import { connect } from 'react-redux'
 import actions from '../actions'
 
-class Count extends Component {
-    render () {
-        const { currentValue, increase, decrease } = this.props;
-        return (
-            <div>
-                <h2>Count</h2>
-                <p>Current count: {currentValue}</p>
-                <p>
-                    <button onClick={increase}>+</button>
-                    <button onClick={decrease}>-</button>
-                </p>
-            </div>
-        )
-    }
+const Count = (props) => {
+    const { currentValue, increase, decrease } = props
+
+    return (
+        <div>
+            <h2>Count</h2>
+            <p>Current count: { currentValue }</p>
+            <p>
+                <button onClick={ increase }>+</button>
+                <button onClick={ decrease }>-</button>
+            </p>
+        </div>
+    )
 }
 
 Count.propTypes = {
         increase : PropTypes.func.isRequired,
         decrease : PropTypes.func.isRequired
-};
+}
 
-const mapStateToProps = (state) => state.count;
+const mapStateToProps = (state) => state.count
 
 const mapDispatchToProps = (dispatch) => {
     return {
         increase() {
-            dispatch(actions.countIncrease());
+            dispatch(actions.countIncrease())
         },
         decrease() {
-            dispatch(actions.countDecrease());
+            dispatch(actions.countDecrease())
         }
     }
-};
+}
 
-export default connect(mapStateToProps, mapDispatchToProps)(Count);
\ No newline at end of file
+export default connect(mapStateToProps, mapDispatchToProps)(Count)
diff --git a/src/components/home.js b/src/components/home.js
index 88dba2b..a1ab7c2 100644
--- a/src/components/home.js
+++ b/src/components/home.js
@@ -1,15 +1,12 @@
-import React, { Component } from 'react';
-
-export default class Home extends Component {
-    render() {
-        return (
-            <div>
-                <h2>Hello World!</h2>
-                <p>Simple static component with not special content at all.</p>
-            </div>
-        )
-    }
+import React from 'react'
+
+const Home = () => {
+    return (
+        <div>
+            <h2>Hello World!</h2>
+            <p>Simple static component with not special content at all.</p>
+        </div>
+    )
 }
 
-
-
+export default Home
diff --git a/src/components/nav.js b/src/components/nav.js
index 81ec4b3..598304f 100644
--- a/src/components/nav.js
+++ b/src/components/nav.js
@@ -1,17 +1,16 @@
-import React, { Component } from 'react'
+import React from 'react'
 import { Link } from 'react-router'
 
-export default class Nav extends Component {
-    render () {
-        return (
-            <div id="nav">
-                <ul>
-                    <li><Link to="/">Home</Link></li>
-                    <li><Link to="/count">Count</Link></li>
-                </ul>
-                <div className="clear"/>
-            </div>
-        )
-    }
+const Nav = () => {
+    return (
+        <div id="nav">
+            <ul>
+                <li><Link to="/">Home</Link></li>
+                <li><Link to="/count">Count</Link></li>
+            </ul>
+            <div className="clear"/>
+        </div>
+    )
 }
 
+export default Nav
diff --git a/src/components/wrap.js b/src/components/wrap.js
index e981184..ecdfda0 100644
--- a/src/components/wrap.js
+++ b/src/components/wrap.js
@@ -1,14 +1,16 @@
-import React, { Component } from 'react'
+import React from 'react'
 import Nav from './nav'
 
-export default class Wrap extends Component {
-    render (){
-        return (
-            <div id="wrap">
-                <h1>React, React Router &amp; Redux example</h1>
-                <Nav/>
-                { this.props.children }
-            </div>
-        )
-    }
+const Wrap = (props) => {
+    const { children } = props
+
+    return (
+        <div id="wrap">
+            <h1>React, React Router &amp; Redux example</h1>
+            <Nav/>
+            { children }
+        </div>
+    )
 }
+
+export default Wrap
diff --git a/src/initial-state.js b/src/initial-state.js
index 747fb11..5795057 100644
--- a/src/initial-state.js
+++ b/src/initial-state.js
@@ -1,8 +1,9 @@
-export default () => {
+const initialState = () => {
     return {
         count: {
-            currentValue: 0
+          currentValue: 0
         }
     }
-};
+}
 
+export default initialState
diff --git a/src/reducers/count.js b/src/reducers/count.js
index 5df96ff..5d30a50 100644
--- a/src/reducers/count.js
+++ b/src/reducers/count.js
@@ -1,17 +1,17 @@
 import initialState from './../initial-state'
 
 const CountReducer = (state, action) => {
-    const newState = Object.assign({}, state);
+    const newState = Object.assign({}, state)
     switch(action.type){
         case 'COUNT_INC':
-            newState.currentValue += 1;
-            return newState;
+            newState.currentValue += 1
+            return newState
         case 'COUNT_DEC':
-            newState.currentValue -= 1;
-            return newState;
+            newState.currentValue -= 1
+            return newState
         default:
-            return state || initialState().count;
+            return state || initialState().count
     }
-};
+}
 
-export default CountReducer
\ No newline at end of file
+export default CountReducer
diff --git a/src/routes.js b/src/routes.js
index 954f6b8..ff25b25 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,12 +1,12 @@
 import React from 'react'
 import ReactRouter, { IndexRoute, Route } from 'react-router'
-import Wrap from './components/wrap';
-import Home from './components/home';
-import Count from './components/count';
+import Wrap from './components/wrap'
+import Home from './components/home'
+import Count from './components/count'
 
 export default (
-    <Route path='/' component={Wrap}>
-        <IndexRoute component={Home}/>
-        <Route path='/count' component={Count}/>
+    <Route path='/' component={ Wrap }>
+        <IndexRoute component={ Home }/>
+        <Route path='/count' component={ Count }/>
     </Route>
-);
\ No newline at end of file
+)
diff --git a/src/store.js b/src/store.js
index 4b0e120..bb3f52e 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,10 +1,11 @@
 import { combineReducers, createStore } from 'redux'
-import initialState from './initial-state';
-import countReducer from './reducers/count';
+import initialState from './initial-state'
+import countReducer from './reducers/count'
+
 var reducers = combineReducers({
     count: countReducer
-});
+})
 
-var store = createStore(reducers, initialState());
+var store = createStore(reducers, initialState())
 
-export default store;
\ No newline at end of file
+export default store