diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt
index 3134b94..cd46c00 100644
--- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt
+++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt
@@ -1,7 +1,7 @@
 package com.shr4pnel.ferretirc.net
 
-import com.shr4pnel.ferretirc.util.Helpers
 import com.shr4pnel.ferretirc.net.messages.ServerMessage
+import com.shr4pnel.ferretirc.util.Helpers
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.oshai.kotlinlogging.slf4j.logger
 import kotlinx.coroutines.channels.Channel
@@ -39,11 +39,13 @@ class MessageParser(val incoming: Channel<String>) {
                 override fun toServerMessage() =
                     when (command.uppercase()) {
                         "PONG" -> ServerMessage.Pong(getTrailingParameterString().removePrefix(":"))
+
+                        // TODO MODE, CHANMODE, LOCALMODE
                         "MODE" ->
                             ServerMessage.Mode(
                                 parameters.first(),
                                 parameters.last().removePrefix(":"),
-                            ) // TODO MODE, CHANMODE, LOCALMODE
+                            )
 
                         "NOTICE" ->
                             ServerMessage.Notice(
@@ -57,9 +59,7 @@ class MessageParser(val incoming: Channel<String>) {
                                 getTrailingParameterString(),
                             )
 
-                        else -> {
-                            ServerMessage.UNIMPLEMENTED("$command ${parameters.joinToString(" ")}")
-                        }
+                        else -> ServerMessage.UNIMPLEMENTED("$command ${parameters.joinToString(" ")}")
                     }
             }
 
diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt
index eaa73a2..d26ec5d 100644
--- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt
+++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt
@@ -1,8 +1,8 @@
 package com.shr4pnel.ferretirc.net
 
-import com.shr4pnel.ferretirc.util.Helpers
 import com.shr4pnel.ferretirc.net.messages.MessageIO
 import com.shr4pnel.ferretirc.net.messages.ServerMessage
+import com.shr4pnel.ferretirc.util.Helpers
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.oshai.kotlinlogging.slf4j.logger
 import io.ktor.network.sockets.Socket
diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt
index d03a083..754b863 100644
--- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt
+++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt
@@ -1,7 +1,7 @@
 package com.shr4pnel.ferretirc.net
 
-import com.shr4pnel.ferretirc.util.Helpers
 import com.shr4pnel.ferretirc.net.messages.MessageIO
+import com.shr4pnel.ferretirc.util.Helpers
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.github.oshai.kotlinlogging.slf4j.logger
 import io.ktor.network.sockets.Socket
diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt
index 518766c..e41b6ad 100644
--- a/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt
+++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt
@@ -1,8 +1,5 @@
 package com.shr4pnel.ferretirc.net.messages
 
-import java.lang.annotation.ElementType
-import java.lang.annotation.Inherited
-
 /**
  * Representation of responses from the IRC server
  */