diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
index d40e025484..4bdfc7b105 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
@@ -59,9 +59,11 @@ class IdentityChangeStatePresenter @Inject constructor(
         )
     }
 
-    private fun CoroutineScope.observeRoomMemberIdentityStateChange(roomMemberIdentityStateChange: MutableState<PersistentList<RoomMemberIdentityStateChange>>) {
-        combine(room.identityStateChangesFlow, room.membersStateFlow) { IdentityStateChanges, membersState ->
-            IdentityStateChanges.map { identityStateChange ->
+    private fun CoroutineScope.observeRoomMemberIdentityStateChange(
+        roomMemberIdentityStateChange: MutableState<PersistentList<RoomMemberIdentityStateChange>>
+    ) {
+        combine(room.identityStateChangesFlow, room.membersStateFlow) { identityStateChanges, membersState ->
+            identityStateChanges.map { identityStateChange ->
                 val member = membersState.roomMembers()
                     ?.firstOrNull { roomMember -> roomMember.userId == identityStateChange.userId }
                     ?: createDefaultRoomMemberForIdentityChange(identityStateChange.userId)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
index 2aa9d31ede..bbcb2a0375 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/encryption/identity/IdentityState.kt
@@ -8,7 +8,7 @@
 package io.element.android.libraries.matrix.api.encryption.identity
 
 enum class IdentityState {
-    /** The user is verified with us */
+    /** The user is verified with us. */
     Verified,
 
     /**
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
index cdcea1cafa..c84ab859b5 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
@@ -205,7 +205,7 @@ internal class RustEncryptionService(
     }
 
     override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatching {
-        val userIdentity = service.getUserIdentity(userId.value) ?: throw IllegalStateException("User identity not found")
+        val userIdentity = service.getUserIdentity(userId.value) ?: error("User identity not found")
         userIdentity.pin()
     }
 }