diff --git a/src/App.js b/src/App.js
index 344d51ae..0a1182f8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -305,7 +305,4 @@ const mapDispatchToProps = dispatch => ({
   ),
 });
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(App);
+export default connect(mapStateToProps, mapDispatchToProps)(App);
diff --git a/src/components/Appshell/Appshell.js b/src/components/Appshell/Appshell.js
index 4e3fbfaf..1e7cdfa2 100644
--- a/src/components/Appshell/Appshell.js
+++ b/src/components/Appshell/Appshell.js
@@ -506,11 +506,6 @@ const mapDispatchToProps = dispatch => ({
 
 export default withRouter(
   withTheme()(
-    withStyles(styles)(
-      connect(
-        mapStateToProps,
-        mapDispatchToProps,
-      )(Appshell),
-    ),
+    withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Appshell)),
   ),
 );
diff --git a/src/components/CustomCircularInput/CustomCircularInput.js b/src/components/CustomCircularInput/CustomCircularInput.js
index 3faeb756..f435152e 100644
--- a/src/components/CustomCircularInput/CustomCircularInput.js
+++ b/src/components/CustomCircularInput/CustomCircularInput.js
@@ -94,8 +94,5 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default withTheme(
-  connect(
-    null,
-    mapDispatchToProps,
-  )(CustomCircularInput),
+  connect(null, mapDispatchToProps)(CustomCircularInput),
 );
diff --git a/src/components/CustomSliderInput/CustomSliderInput.js b/src/components/CustomSliderInput/CustomSliderInput.js
index 9d16a1f2..0dbd740e 100644
--- a/src/components/CustomSliderInput/CustomSliderInput.js
+++ b/src/components/CustomSliderInput/CustomSliderInput.js
@@ -96,8 +96,5 @@ const mapDispatchToProps = dispatch => ({
 });
 
 export default withStyles(styles)(
-  connect(
-    null,
-    mapDispatchToProps,
-  )(CustomSliderInput),
+  connect(null, mapDispatchToProps)(CustomSliderInput),
 );
diff --git a/src/components/GraphPanelLayout/GraphPanelLayout.js b/src/components/GraphPanelLayout/GraphPanelLayout.js
index 60eb97f5..71a9a216 100644
--- a/src/components/GraphPanelLayout/GraphPanelLayout.js
+++ b/src/components/GraphPanelLayout/GraphPanelLayout.js
@@ -5,7 +5,7 @@ import {
   SettingsContainer,
   SettingsWrapper,
   GraphContainer,
-  InformationContainer
+  InformationContainer,
 } from './GraphPanelLayout.styles';
 
 const GraphPanelLayout = ({ actionButtons, settings, graph, information }) => {
diff --git a/src/components/SimplePanelLayout/SimplePanelLayout.js b/src/components/SimplePanelLayout/SimplePanelLayout.js
index 42290913..ffb5e3fb 100644
--- a/src/components/SimplePanelLayout/SimplePanelLayout.js
+++ b/src/components/SimplePanelLayout/SimplePanelLayout.js
@@ -1,8 +1,5 @@
 import React from 'react';
-import {
-  LayoutWrapper,
-  LayoutContainer,
-} from './SimplePanelLayout.styles';
+import { LayoutWrapper, LayoutContainer } from './SimplePanelLayout.styles';
 
 const SimplePanelLayout = props => {
   const { panel } = props;
diff --git a/src/screen/AboutUs/AboutUs.js b/src/screen/AboutUs/AboutUs.js
index ec6bd953..0e777931 100644
--- a/src/screen/AboutUs/AboutUs.js
+++ b/src/screen/AboutUs/AboutUs.js
@@ -132,10 +132,10 @@ const AboutUs = () => {
           }}
         >
           <ListItemIcon>
-            <img 
+            <img
               src={FacebookIcon}
-              style={{ height: '3em', width: '3em' }} 
-              alt="" 
+              style={{ height: '3em', width: '3em' }}
+              alt=""
             />
           </ListItemIcon>
           <ListItemText primary="Like us on Facebook" />
@@ -156,10 +156,10 @@ const AboutUs = () => {
           }}
         >
           <ListItemIcon>
-            <img 
+            <img
               src={TwitterIcon}
-              style={{ height: '3em', width: '3em' }} 
-              alt=""  
+              style={{ height: '3em', width: '3em' }}
+              alt=""
             />
           </ListItemIcon>
           <ListItemText primary="Follow us on Twitter" />
@@ -183,7 +183,7 @@ const AboutUs = () => {
             <img
               src={YoutubeIcon}
               style={{ height: '3em', width: '3em' }}
-              alt="" 
+              alt=""
             />
           </ListItemIcon>
           <ListItemText primary="Watch us on Youtube" />
diff --git a/src/screen/DeviceScreen/DeviceScreen.js b/src/screen/DeviceScreen/DeviceScreen.js
index 45ea0824..04f4010c 100644
--- a/src/screen/DeviceScreen/DeviceScreen.js
+++ b/src/screen/DeviceScreen/DeviceScreen.js
@@ -125,7 +125,4 @@ const mapStateToProps = state => ({
   deviceInformation: state.app.device.deviceInformation,
 });
 
-export default connect(
-  mapStateToProps,
-  null,
-)(DeviceScreen);
+export default connect(mapStateToProps, null)(DeviceScreen);
diff --git a/src/screen/DeviceScreen/index.js b/src/screen/DeviceScreen/index.js
index e279474c..b007fef0 100644
--- a/src/screen/DeviceScreen/index.js
+++ b/src/screen/DeviceScreen/index.js
@@ -1,3 +1,3 @@
 import DeviceScreen from './DeviceScreen';
 
-export default DeviceScreen;
\ No newline at end of file
+export default DeviceScreen;
diff --git a/src/screen/FAQ/FAQ.js b/src/screen/FAQ/FAQ.js
index a7a45d9f..f1fb0867 100644
--- a/src/screen/FAQ/FAQ.js
+++ b/src/screen/FAQ/FAQ.js
@@ -436,7 +436,10 @@ const FAQ = () => {
               collected. Future versions of the device will come with a SD card
               to store the data locally as well. At the moment there are still
               limits to using this feature, but we are continuously working on
-              it <span role="img" aria-label="smiley">🙂</span>
+              it{' '}
+              <span role="img" aria-label="smiley">
+                🙂
+              </span>
             </Typography>
           </ExpansionPanelDetails>
         </ExpansionPanel>
diff --git a/src/screen/Home/components/InstrumentCard.styles.js b/src/screen/Home/components/InstrumentCard.styles.js
index b5fb6649..3a651232 100644
--- a/src/screen/Home/components/InstrumentCard.styles.js
+++ b/src/screen/Home/components/InstrumentCard.styles.js
@@ -5,7 +5,7 @@ export const CustomCard = styled.div`
   display: flex;
   width: 48em;
   height: 26em;
-  margin-right:1em;
+  margin-right: 1em;
   transition-timing-function: ease-in-out;
   transition-duration: 200ms;
   border-radius: 8px;
@@ -20,7 +20,7 @@ export const CustomCard = styled.div`
   }
 
   @media only screen and (max-width: 1800px) {
-    margin-top:10px;
+    margin-top: 10px;
   }
 `;
 
@@ -75,5 +75,4 @@ export const VerticalBar = styled.div`
   border-color: #fff;
   border-width: 0px 4px 0px 4px;
   clip-path: polygon(0 0, 100% 0, 100% 100%, 0 89%);
-
 `;
diff --git a/src/screen/Home/components/Tabs.js b/src/screen/Home/components/Tabs.js
index d2bc1f11..fc38f286 100644
--- a/src/screen/Home/components/Tabs.js
+++ b/src/screen/Home/components/Tabs.js
@@ -13,7 +13,6 @@ import {
 
 const Tabs = () => {
   return (
-    
     <TabsContainer>
       <Scrollbars autoHide autoHideTimeout={1000}>
         <TabsRow>
diff --git a/src/screen/Home/components/Tabs.styles.js b/src/screen/Home/components/Tabs.styles.js
index efc8daef..60131a3b 100644
--- a/src/screen/Home/components/Tabs.styles.js
+++ b/src/screen/Home/components/Tabs.styles.js
@@ -9,27 +9,26 @@ export const TabsContainer = styled.div`
 
 export const TabsRow = styled.div`
   display: flex;
-    flex-wrap: wrap;
+  flex-wrap: wrap;
   justify-content: center;
   align-items: center;
 `;
 
 export const TabsWrapper = styled.div`
   display: flex;
-   flex-wrap: wrap;
-   justify-content: center;
+  flex-wrap: wrap;
+  justify-content: center;
 `;
 
-export const InstrumentCard= styled.div`
+export const InstrumentCard = styled.div`
   display: flex;
-      flex-wrap: wrap;
-    justify-content: center;
-   align-items: center;
+  flex-wrap: wrap;
+  justify-content: center;
+  align-items: center;
   @media only screen and (max-width: 1800px) {
     display: flex;
-     flex-direction: wrap;
-   justify-content: center;
-   align-items: center;
+    flex-direction: wrap;
+    justify-content: center;
+    align-items: center;
   }
 `;
-
diff --git a/src/screen/LoggedData/LoggedData.js b/src/screen/LoggedData/LoggedData.js
index 5bfd5d9e..d7fee71b 100644
--- a/src/screen/LoggedData/LoggedData.js
+++ b/src/screen/LoggedData/LoggedData.js
@@ -232,9 +232,4 @@ const mapDispatchToProps = dispatch => ({
   ),
 });
 
-export default withRouter(
-  connect(
-    null,
-    mapDispatchToProps,
-  )(LoggedData),
-);
+export default withRouter(connect(null, mapDispatchToProps)(LoggedData));
diff --git a/src/screen/LogicAnalyzer/LogicAnalyzer.js b/src/screen/LogicAnalyzer/LogicAnalyzer.js
index 2bc475cc..0228da0a 100644
--- a/src/screen/LogicAnalyzer/LogicAnalyzer.js
+++ b/src/screen/LogicAnalyzer/LogicAnalyzer.js
@@ -224,7 +224,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default connect(
-  mapStateToProps,
-  null,
-)(LogicAnalyzer);
+export default connect(mapStateToProps, null)(LogicAnalyzer);
diff --git a/src/screen/Multimeter/Multimeter.js b/src/screen/Multimeter/Multimeter.js
index cffc1f08..ee693d77 100644
--- a/src/screen/Multimeter/Multimeter.js
+++ b/src/screen/Multimeter/Multimeter.js
@@ -153,7 +153,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default connect(
-  mapStateToProps,
-  null,
-)(Multimeter);
+export default connect(mapStateToProps, null)(Multimeter);
diff --git a/src/screen/Oscilloscope/Oscilloscope.js b/src/screen/Oscilloscope/Oscilloscope.js
index 3b90539a..90757b01 100644
--- a/src/screen/Oscilloscope/Oscilloscope.js
+++ b/src/screen/Oscilloscope/Oscilloscope.js
@@ -370,7 +370,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default connect(
-  mapStateToProps,
-  null,
-)(Oscilloscope);
+export default connect(mapStateToProps, null)(Oscilloscope);
diff --git a/src/screen/PowerSource/PowerSource.js b/src/screen/PowerSource/PowerSource.js
index e51d907d..a4b25d49 100644
--- a/src/screen/PowerSource/PowerSource.js
+++ b/src/screen/PowerSource/PowerSource.js
@@ -116,9 +116,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default withRouter(
-  connect(
-    mapStateToProps,
-    null,
-  )(PowerSouce),
-);
+export default withRouter(connect(mapStateToProps, null)(PowerSouce));
diff --git a/src/screen/PowerSource/components/InstrumentCluster.js b/src/screen/PowerSource/components/InstrumentCluster.js
index 836ecd77..d0b94a2b 100644
--- a/src/screen/PowerSource/components/InstrumentCluster.js
+++ b/src/screen/PowerSource/components/InstrumentCluster.js
@@ -319,9 +319,4 @@ const mapDispatchToProps = dispatch => ({
   ),
 });
 
-export default withStyles(styles)(
-  connect(
-    null,
-    mapDispatchToProps,
-  )(Settings),
-);
+export default withStyles(styles)(connect(null, mapDispatchToProps)(Settings));
diff --git a/src/screen/RobotArm/RobotArm.js b/src/screen/RobotArm/RobotArm.js
index 08d2e0f1..9eb0bd4b 100644
--- a/src/screen/RobotArm/RobotArm.js
+++ b/src/screen/RobotArm/RobotArm.js
@@ -1,10 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import {
-  Container,
-  KnobWrapper,
-  PaintWrapper
-} from './RobotArm.styles';
+import { Container, KnobWrapper, PaintWrapper } from './RobotArm.styles';
 import PaintArea from './Components/PaintArea';
 import KnobControl from './Components/KnobControl';
 import range from 'lodash/range';
@@ -181,7 +177,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default connect(
-  mapStateToProps,
-  null,
-)(RobotArm);
+export default connect(mapStateToProps, null)(RobotArm);
diff --git a/src/screen/WaveGenerator/WaveGenerator.js b/src/screen/WaveGenerator/WaveGenerator.js
index f6ff25f2..39555bfc 100644
--- a/src/screen/WaveGenerator/WaveGenerator.js
+++ b/src/screen/WaveGenerator/WaveGenerator.js
@@ -200,9 +200,4 @@ const mapStateToProps = state => ({
   isConnected: state.app.device.isConnected,
 });
 
-export default withRouter(
-  connect(
-    mapStateToProps,
-    null,
-  )(WaveGenerator),
-);
+export default withRouter(connect(mapStateToProps, null)(WaveGenerator));