diff --git a/app/api/index.js b/app/api/index.js
index e71c69df..d394fe60 100644
--- a/app/api/index.js
+++ b/app/api/index.js
@@ -16,12 +16,12 @@ export function requestTickers(ids) {
 }
 
 
-export function requestBlockHeight(id) {
-  const BASE_URL = `https://testnet-api.smartbit.com.au/v1/blockchain/blocks?limit=1`
+export function requestBlockHeight() {
+  const BASE_URL = 'https://testnet-api.smartbit.com.au/v1/blockchain/blocks?limit=1'
   return axios({
     method: 'get',
     url: BASE_URL
   })
     .then(response => response.data)
     .catch(error => error)
-}
\ No newline at end of file
+}
diff --git a/app/components/Channels/Channels.js b/app/components/Channels/Channels.js
index 4ad0929e..012190e4 100644
--- a/app/components/Channels/Channels.js
+++ b/app/components/Channels/Channels.js
@@ -27,15 +27,15 @@ const Channels = ({
 }) => {
   const refreshClicked = (event) => {
     // store event in icon so we dont get an error when react clears it
-    let icon = event.currentTarget
+    const icon = event.currentTarget
 
     // fetch channels 
     fetchChannels()
-    
+
     // clear animation after the second so we can reuse it
-    setTimeout(() => icon.style.animation = '', 1000)
+    setTimeout(() => { icon.style.animation = '' }, 1000)
 
-   // spin icon for 1 sec
+    // spin icon for 1 sec
     icon.style.animation = 'spin 1000ms linear 1'
   }
 
@@ -48,13 +48,20 @@ const Channels = ({
         explorerLinkBase={explorerLinkBase}
         closeChannel={closeChannel}
       />
-      <ChannelForm form={channelForm} setForm={setChannelForm} ticker={ticker} peers={peers} openChannel={openChannel} currentTicker={currentTicker} />
+      <ChannelForm
+        form={channelForm}
+        setForm={setChannelForm}
+        ticker={ticker}
+        peers={peers}
+        openChannel={openChannel}
+        currentTicker={currentTicker}
+      />
       <div className={styles.header}>
         <h3>Channels</h3>
         <span
           className={`${styles.refresh} hint--top`}
           data-hint='Refresh your channels list'
-          
+
         >
           <FaRepeat
             style={{ verticalAlign: 'baseline' }}
@@ -113,6 +120,7 @@ const Channels = ({
 }
 
 Channels.propTypes = {
+  fetchChannels: PropTypes.func.isRequired,
   ticker: PropTypes.object.isRequired,
   peers: PropTypes.array.isRequired,
   channelsLoading: PropTypes.bool.isRequired,
diff --git a/app/components/LndSyncing/LndSyncing.js b/app/components/LndSyncing/LndSyncing.js
index 43acbde1..eff73e6a 100644
--- a/app/components/LndSyncing/LndSyncing.js
+++ b/app/components/LndSyncing/LndSyncing.js
@@ -1,14 +1,15 @@
 import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import styles from './LndSyncing.scss'
 
 class LndSyncing extends Component {
   constructor(props) {
-  super(props);
+    super(props);
     this.state = {
       facts: [
         {
           title: 'No2x',
-          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA signers. The idea was drawn up and signed in a locked hotel room with select individuals and goes against everything that Bitcoin stands for. There is no favoritism in Bitcoin. There are no politicians. Hash power and business don\'t speak for us. Don\'t trust, verify.'
+          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA signers. The idea was drawn up and signed in a locked hotel room with select individuals and goes against everything that Bitcoin stands for. There is no favoritism in Bitcoin. There are no politicians. Hash power and business don\'t speak for us. Don\'t trust, verify.' // eslint-disable-line
         },
         {
           title: 'Gang',
@@ -41,8 +42,7 @@ class LndSyncing extends Component {
         <h3>zap</h3>
         <div className={styles.loading}>
           {!fetchingBlockHeight && <h4>{syncPercentage}%</h4>}
-          <div className={styles.spinner}>
-          </div>
+          <div className={styles.spinner} />
           <h1>syncing your lightning node to the blockchain</h1>
         </div>
         <div className={styles.facts}>
@@ -52,15 +52,13 @@ class LndSyncing extends Component {
           </div>
           <ul>
             {
-              facts.map((facts, index) => {
-                return (
-                  <li
-                    className={`${styles.factButton} ${currentFact === index && styles.active}`}
-                    key={index}
-                    onClick={() => this.setState({ currentFact: index })}
-                  />
-                )
-              })
+              facts.map((fact, index) => (
+                <li
+                  className={`${styles.factButton} ${currentFact === index && styles.active}`}
+                  key={index}
+                  onClick={() => this.setState({ currentFact: index })}
+                />
+              ))
             }
           </ul>
         </div>
@@ -69,4 +67,10 @@ class LndSyncing extends Component {
   }
 }
 
+LndSyncing.propTypes = {
+  fetchBlockHeight: PropTypes.func.isRequired,
+  fetchingBlockHeight: PropTypes.bool.isRequired,
+  syncPercentage: PropTypes.number.isRequired
+}
+
 export default LndSyncing
diff --git a/app/components/Peers/Peers.js b/app/components/Peers/Peers.js
index e90a0cbd..45115cec 100644
--- a/app/components/Peers/Peers.js
+++ b/app/components/Peers/Peers.js
@@ -21,15 +21,15 @@ const Peers = ({
 }) => {
   const refreshClicked = (event) => {
     // store event in icon so we dont get an error when react clears it
-    let icon = event.currentTarget
+    const icon = event.currentTarget
 
     // fetch peers
     fetchPeers()
-    
+
     // clear animation after the second so we can reuse it
-    setTimeout(() => icon.style.animation = '', 1000)
+    setTimeout(() => { icon.style.animation = '' }, 1000)
 
-   // spin icon for 1 sec
+    // spin icon for 1 sec
     icon.style.animation = 'spin 1000ms linear 1'
   }
 
@@ -42,7 +42,7 @@ const Peers = ({
         <span
           className={`${styles.refresh} hint--top`}
           data-hint='Refresh your peers list'
-          
+
         >
           <FaRepeat
             style={{ verticalAlign: 'baseline' }}
@@ -70,6 +70,7 @@ const Peers = ({
 }
 
 Peers.propTypes = {
+  fetchPeers: PropTypes.func.isRequired,
   peersLoading: PropTypes.bool.isRequired,
   peers: PropTypes.array.isRequired,
   setPeer: PropTypes.func.isRequired,
diff --git a/app/lnd/index.js b/app/lnd/index.js
index cb8d8a03..ef0d3623 100644
--- a/app/lnd/index.js
+++ b/app/lnd/index.js
@@ -5,9 +5,9 @@ import methods from './methods'
 
 export default (callback) => {
   const lnd = lightning(config.lightningRpc, config.lightningHost)
-  
+
   const lndSubscribe = mainWindow => subscribe(mainWindow, lnd)
   const lndMethods = (event, msg, data) => methods(lnd, event, msg, data)
 
   callback(lndSubscribe, lndMethods)
-}
\ No newline at end of file
+}
diff --git a/app/lnd/lib/lightning.js b/app/lnd/lib/lightning.js
index 3c3a30f8..5af4443a 100644
--- a/app/lnd/lib/lightning.js
+++ b/app/lnd/lib/lightning.js
@@ -5,7 +5,6 @@ import config from '../config'
 
 module.exports = (rpcpath, host) => {
   process.env.GRPC_SSL_CIPHER_SUITES = 'HIGH+ECDSA'
-  console.log('RPC PATH: ', path.join(__dirname, 'rpc.proto'))
   const rpc = grpc.load(path.join(__dirname, 'rpc.proto'))
 
   const lndCert = fs.readFileSync(config.cert)
diff --git a/app/lnd/subscribe/index.js b/app/lnd/subscribe/index.js
index ae1f08f5..170adf60 100644
--- a/app/lnd/subscribe/index.js
+++ b/app/lnd/subscribe/index.js
@@ -2,8 +2,6 @@ import subscribeToTransactions from './transactions'
 import subscribeToInvoices from './invoices'
 
 export default (mainWindow, lnd) => {
-  console.log('mainWindow: ', mainWindow)
-  console.log('lnd: ', lnd)
   subscribeToTransactions(mainWindow, lnd)
   subscribeToInvoices(mainWindow, lnd)
 }
diff --git a/app/reducers/balance.js b/app/reducers/balance.js
index 4b1b458e..4da402fe 100644
--- a/app/reducers/balance.js
+++ b/app/reducers/balance.js
@@ -21,7 +21,7 @@ export const fetchBalance = () => async (dispatch) => {
 }
 
 // Receive IPC event for balance
-export const receiveBalance = (event, { walletBalance, channelBalance }) => dispatch => {
+export const receiveBalance = (event, { walletBalance, channelBalance }) => (dispatch) => {
   dispatch({ type: RECEIVE_BALANCE, walletBalance, channelBalance })
 }
 
diff --git a/app/reducers/ipc.js b/app/reducers/ipc.js
index d8329d1b..a0789e30 100644
--- a/app/reducers/ipc.js
+++ b/app/reducers/ipc.js
@@ -36,7 +36,7 @@ const ipc = createIpc({
   lndSyncing,
   lndSynced,
   lndStdout,
-  
+
   receiveInfo,
 
   receivePeers,
diff --git a/app/reducers/lnd.js b/app/reducers/lnd.js
index 613db848..0c237775 100644
--- a/app/reducers/lnd.js
+++ b/app/reducers/lnd.js
@@ -22,7 +22,7 @@ export const RECEIVE_BLOCK_HEIGHT = 'RECEIVE_BLOCK_HEIGHT'
 export const lndSyncing = () => dispatch => dispatch({ type: START_SYNCING })
 
 // Receive IPC event for LND stoping sync
-export const lndSynced = () => dispatch => {
+export const lndSynced = () => (dispatch) => {
   // Fetch data now that we know LND is synced
   dispatch(fetchTicker())
   dispatch(fetchBalance())
@@ -32,7 +32,9 @@ export const lndSynced = () => dispatch => {
 }
 
 // Receive IPC event for LND streaming a line
-export const lndStdout = (event, lndBlockHeight) => dispatch => dispatch({ type: RECEIVE_LINE, lndBlockHeight: lndBlockHeight.split(' ')[0].split(/(\r\n|\n|\r)/gm)[0] })
+export const lndStdout = (event, lndBlockHeight) => dispatch => (
+  dispatch({ type: RECEIVE_LINE, lndBlockHeight: lndBlockHeight.split(' ')[0].split(/(\r\n|\n|\r)/gm)[0] })
+)
 
 export function getBlockHeight() {
   return {
@@ -60,11 +62,11 @@ export const fetchBlockHeight = () => async (dispatch) => {
 const ACTION_HANDLERS = {
   [START_SYNCING]: state => ({ ...state, syncing: true }),
   [STOP_SYNCING]: state => ({ ...state, syncing: false }),
-  
+
   [RECEIVE_LINE]: (state, { lndBlockHeight }) => ({ ...state, lndBlockHeight }),
-  
+
   [GET_BLOCK_HEIGHT]: state => ({ ...state, fetchingBlockHeight: true }),
-  [RECEIVE_BLOCK_HEIGHT]: (state, { blockHeight }) => ({ ...state, blockHeight, fetchingBlockHeight: false }),
+  [RECEIVE_BLOCK_HEIGHT]: (state, { blockHeight }) => ({ ...state, blockHeight, fetchingBlockHeight: false })
 }
 
 // ------------------------------------
diff --git a/app/reducers/transaction.js b/app/reducers/transaction.js
index cd305ffc..33821551 100644
--- a/app/reducers/transaction.js
+++ b/app/reducers/transaction.js
@@ -73,10 +73,9 @@ export const transactionError = () => (dispatch) => {
 
 // Listener for when a new transaction is pushed from the subscriber
 export const newTransaction = (event, { transaction }) => (dispatch) => {
-  console.log('transaction: ', transaction)
   // Fetch new balance
   dispatch(fetchBalance())
-  
+
   dispatch({ type: ADD_TRANSACTION, transaction })
 
   // HTML 5 desktop notification for the new transaction
diff --git a/app/routes/app/components/App.js b/app/routes/app/components/App.js
index 837bba83..43df072d 100644
--- a/app/routes/app/components/App.js
+++ b/app/routes/app/components/App.js
@@ -11,10 +11,6 @@ class App extends Component {
   componentWillMount() {
     const { fetchTicker, fetchBalance, fetchInfo, lnd: { syncing } } = this.props
 
-    if (syncing) {
-      fetchBlockHeight()
-    }
-
     if (!syncing) {
       fetchTicker()
       fetchBalance()
@@ -51,7 +47,7 @@ class App extends Component {
           fetchingBlockHeight={lnd.fetchingBlockHeight}
           syncPercentage={syncPercentage}
         />
-      ) 
+      )
     }
 
     if (!currentTicker) { return <LoadingBolt /> }
@@ -86,6 +82,11 @@ class App extends Component {
 }
 
 App.propTypes = {
+  lnd: PropTypes.object.isRequired,
+
+  syncPercentage: PropTypes.number.isRequired,
+  fetchBlockHeight: PropTypes.func.isRequired,
+
   modal: PropTypes.object.isRequired,
   ticker: PropTypes.object.isRequired,
   balance: PropTypes.object.isRequired,