diff --git a/src/FilterLists.Web.V2/src/App.test.tsx b/src/FilterLists.Web.V2/src/App.test.tsx
index a754b201b..7ca229b98 100644
--- a/src/FilterLists.Web.V2/src/App.test.tsx
+++ b/src/FilterLists.Web.V2/src/App.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './App';
+
+import { App } from './App';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');
diff --git a/src/FilterLists.Web.V2/src/App.tsx b/src/FilterLists.Web.V2/src/App.tsx
index 067710e56..c7dfcc82a 100644
--- a/src/FilterLists.Web.V2/src/App.tsx
+++ b/src/FilterLists.Web.V2/src/App.tsx
@@ -5,24 +5,21 @@ import { AllListsTable } from './modules';
 
 const { Header, Content, Footer } = Layout;
 
-const App: React.FC = () => {
-  return (
-    <Layout>
-      <Header>
-        <Logo />
-        <Menu theme="dark" mode="horizontal" style={{ lineHeight: '64px' }} />
-      </Header>
-      <Content>
-        <div style={{ background: '#fff', paddingLeft: 12, paddingTop: 12, paddingRight: 12, minHeight: 280 }}>
-          <AllListsTable />
-        </div>
-      </Content>
-      <Footer style={{ textAlign: 'center' }}>
-        <CopyrightAuthor /> | <Community /> | <GitHub /> | <Api /> | <Donate />
-      </Footer>
-    </Layout>
-  );
-}
+export const App: React.FC = () =>
+  <Layout>
+    <Header>
+      <Logo />
+      <Menu theme="dark" mode="horizontal" style={{ lineHeight: '64px' }} />
+    </Header>
+    <Content>
+      <div style={{ background: '#fff', paddingLeft: 12, paddingTop: 12, paddingRight: 12, minHeight: 280 }}>
+        <AllListsTable />
+      </div>
+    </Content>
+    <Footer style={{ textAlign: 'center' }}>
+      <CopyrightAuthor /> | <Community /> | <GitHub /> | <Api /> | <Donate />
+    </Footer>
+  </Layout>;
 
 const Logo = () =>
   <img src="logo_filterlists.png"
@@ -65,6 +62,4 @@ const Donate = () =>
     title="Donate to FilterLists with Beerpay"
     target="_blank" rel="noopener noreferrer">
     Donate
-    </a>;
-
-export default App;
\ No newline at end of file
+    </a>;
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/index.tsx b/src/FilterLists.Web.V2/src/index.tsx
index c9a1418bf..8fec59ed5 100644
--- a/src/FilterLists.Web.V2/src/index.tsx
+++ b/src/FilterLists.Web.V2/src/index.tsx
@@ -1,6 +1,8 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
 import './index.css';
 
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import { App } from './App';
+
 ReactDOM.render(<App />, document.getElementById('root'));
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
index 3e03ff4f3..65fa396cf 100644
--- a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
+++ b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx
@@ -113,8 +113,8 @@ export class AllListsTable extends React.Component<{}, State> {
     );
   }
 
-  private tagSorter = (a: number[], b: number[], tags: Tag[]): number => {
-    return a && a.length
+  private tagSorter = (a: number[], b: number[], tags: Tag[]): number =>
+    a && a.length
       ? b && b.length
         ? a.length === b.length
           ? tags.filter((t: Tag) => a.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase() > tags.filter((t: Tag) => b.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase()
@@ -125,7 +125,6 @@ export class AllListsTable extends React.Component<{}, State> {
             : 1
         : -1
       : 1;
-  };
 
   componentWillUnmount() {
     window.removeEventListener('resize', this.updatePageSize);
diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/index.ts b/src/FilterLists.Web.V2/src/modules/allListsTable/index.ts
index fd3e7fb18..35e7597f6 100644
--- a/src/FilterLists.Web.V2/src/modules/allListsTable/index.ts
+++ b/src/FilterLists.Web.V2/src/modules/allListsTable/index.ts
@@ -1,3 +1,3 @@
-import { AllListsTable } from './AllListsTable'
+import { AllListsTable } from './AllListsTable';
 
 export { AllListsTable }
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/modules/index.ts b/src/FilterLists.Web.V2/src/modules/index.ts
index 820f33938..5b656626f 100644
--- a/src/FilterLists.Web.V2/src/modules/index.ts
+++ b/src/FilterLists.Web.V2/src/modules/index.ts
@@ -1,3 +1,3 @@
-import { AllListsTable } from './allListsTable'
+import { AllListsTable } from './allListsTable';
 
 export { AllListsTable }
\ No newline at end of file
diff --git a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
index 23d116a48..41a587c36 100644
--- a/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
+++ b/src/FilterLists.Web.V2/src/shared/buttons/subscribe/SubscribeButton.tsx
@@ -1,6 +1,7 @@
 import { Button, Dropdown, Menu } from 'antd';
-import { ButtonProps, ButtonType } from "antd/lib/button";
+import { ButtonProps, ButtonType } from 'antd/lib/button';
 import React from 'react';
+
 import styles from './SubscribeButton.module.css';
 
 //TODO: import DropdownButtonType from antd rather than redefining if they export the type
diff --git a/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx b/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx
index 80b71d07a..cf45551f7 100644
--- a/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx
+++ b/src/FilterLists.Web.V2/src/shared/tagCloud/TagCloud.tsx
@@ -1,5 +1,6 @@
 import { Tag } from 'antd';
 import React from 'react';
+
 import styles from './TagCloud.module.css';
 
 interface TagData {
@@ -8,7 +9,7 @@ interface TagData {
 };
 
 interface Props {
-  tags?: TagData[]
+  tags: TagData[]
 };
 
 export const TagCloud = (props: Props): JSX.Element | null => {
diff --git a/src/FilterLists.Web.V2/src/utils/index.ts b/src/FilterLists.Web.V2/src/utils/index.ts
index 47426d11c..61acd744c 100644
--- a/src/FilterLists.Web.V2/src/utils/index.ts
+++ b/src/FilterLists.Web.V2/src/utils/index.ts
@@ -1,3 +1,3 @@
-import { nameof } from './nameof'
+import { nameof } from './nameof';
 
 export { nameof }
\ No newline at end of file