diff --git a/frontend/src/components/App.svelte b/frontend/src/components/App.svelte
deleted file mode 100644
index 8992b7e..0000000
--- a/frontend/src/components/App.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-    import Main from "./Main.svelte";
-</script>
-
-<Main />
diff --git a/frontend/src/components/ChannelTopBar.svelte b/frontend/src/components/ChannelTopBar.svelte
index 45d9ed0..6f4e892 100644
--- a/frontend/src/components/ChannelTopBar.svelte
+++ b/frontend/src/components/ChannelTopBar.svelte
@@ -1,6 +1,6 @@
 <script>
-    import { Edit2Icon, HashIcon, MenuIcon } from "svelte-feather-icons";
-    import { overlayStore, selectedChannel, showSidebar } from "../stores";
+    import { HashIcon, MenuIcon } from "svelte-feather-icons";
+    import { overlayStore, showSidebar } from "../stores";
 
     export let channel;
 </script>
diff --git a/frontend/src/components/ChannelView.svelte b/frontend/src/components/ChannelView.svelte
index 09ea81b..6a22db9 100644
--- a/frontend/src/components/ChannelView.svelte
+++ b/frontend/src/components/ChannelView.svelte
@@ -1,5 +1,4 @@
 <script>
-    import { showChannelView } from "../stores";
     import ChannelTopBar from "./ChannelTopBar.svelte";
     import MessageInput from "./MessageInput.svelte";
     import Messages from "./Messages.svelte";
diff --git a/frontend/src/components/MessageInput.svelte b/frontend/src/components/MessageInput.svelte
index 4c93032..b27ef33 100644
--- a/frontend/src/components/MessageInput.svelte
+++ b/frontend/src/components/MessageInput.svelte
@@ -1,6 +1,6 @@
 <script>
     import { SendIcon } from "svelte-feather-icons";
-import request from "../request";
+    import request from "../request";
     import { apiRoute } from "../storage";
     import { messagesStoreProvider, overlayStore, smallViewport, userInfoStore } from "../stores";
 
diff --git a/frontend/src/components/Messages.svelte b/frontend/src/components/Messages.svelte
index cf0863c..9e21775 100644
--- a/frontend/src/components/Messages.svelte
+++ b/frontend/src/components/Messages.svelte
@@ -1,6 +1,6 @@
 <script>
-    import { afterUpdate, beforeUpdate, onMount } from "svelte";
-    import { messagesStoreProvider, showSidebar, smallViewport } from "../stores.js";
+    import { afterUpdate } from "svelte";
+    import { messagesStoreProvider, smallViewport } from "../stores.js";
     import Message from "./Message.svelte";
 
     export let channelId;
diff --git a/frontend/src/components/Sidebar.svelte b/frontend/src/components/Sidebar.svelte
index 6edcf62..62b019f 100644
--- a/frontend/src/components/Sidebar.svelte
+++ b/frontend/src/components/Sidebar.svelte
@@ -11,7 +11,6 @@
 
     // janky code to hide the channel view during animation
     // this will make a smooth sidebar animation on smaller viewports (such as a phone, where you switch between sidebar being active)
-
     const scheduleSelectChannel = (channel) => {
         if ($smallViewport) {
             $showChannelView = false;
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 04b5972..b8fb803 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,4 +1,4 @@
-import App from './components/App.svelte';
+import Main from './components/Main.svelte';
 import gateway from './gateway';
 import { getAuthToken, initStorageDefaults } from './storage';
 import logging from "./logging";
@@ -20,7 +20,7 @@ if (loadingElement) {
 	loadingElement.parentElement.removeChild(loadingElement);
 }
 
-const app = new App({
+const app = new Main({
 	target: document.body
 });
 
diff --git a/frontend/src/stores.js b/frontend/src/stores.js
index d9d3198..d9937b1 100644
--- a/frontend/src/stores.js
+++ b/frontend/src/stores.js
@@ -74,11 +74,7 @@ class ChannelsStore extends Store {
         });
         gateway.subscribe(GatewayEventType.MessageCreate, ({ channel_id }) => {
             const index = this.value.findIndex(e => e.id === channel_id);
-            if (index === -1)
-                return;
-            if (!this.value[index])
-                return;
-            if (selectedChannel.value.id === channel_id)
+            if (index === -1 || !this.value[index] || selectedChannel.value.id === channel_id)
                 return;
 
             this.value[index]._hasUnreads = true;
@@ -86,11 +82,7 @@ class ChannelsStore extends Store {
         });
         selectedChannel.subscribe(({ id }) => {
             const index = this.value.findIndex(e => e.id === id);
-            if (index === -1)
-                return;
-            if (!this.value[index])
-                return;
-            if (!this.value[index]._hasUnreads)
+            if (index === -1 || !this.value[index] || !this.value[index]._hasUnreads)
                 return;
 
             this.value[index]._hasUnreads = false;