diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/AliasManagerState.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/AliasManagerState.kt
index 265167750eff9a8f258fa12a9f4616f34bc8e138..94054b6a18d0529f4d3a174ef6c81a862ddb954c 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/AliasManagerState.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/AliasManagerState.kt
@@ -13,7 +13,6 @@ package de.justjanne.libquassel.protocol.syncables.state
 import de.justjanne.libquassel.protocol.models.Alias
 import de.justjanne.libquassel.protocol.models.BufferInfo
 import de.justjanne.libquassel.protocol.models.Command
-import de.justjanne.libquassel.protocol.syncables.AliasManager
 import de.justjanne.libquassel.protocol.util.expansion.Expansion
 
 data class AliasManagerState(
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/IrcUserState.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/IrcUserState.kt
index 408c1a7a337f1310d93b2f9f499e29b60f5600ef..a93de124b9b9cbdbc26e0b4a30c64209ca026c8b 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/IrcUserState.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/IrcUserState.kt
@@ -33,12 +33,12 @@ data class IrcUserState(
   val channels: Set<String> = emptySet(),
   val userModes: Set<Char> = emptySet()
 ) {
-  fun identifier() = "${network.id}/${nick}"
+  fun identifier() = "${network.id}/$nick"
 
   fun verifiedUser() = user.let {
     if (it.startsWith("~")) null
     else it
   }
 
-  fun hostMask() = "${nick}!${user}@${host}"
+  fun hostMask() = "$nick!$user@$host"
 }