diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/ListWithUniqueSetCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/ListWithUniqueSetCache.kt
index e51406c75..c48bc6a6b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/ListWithUniqueSetCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/ListWithUniqueSetCache.kt
@@ -41,7 +41,7 @@ class ListWithUniqueSetCache<T, U>(
     }
 
     fun distinct(): Set<U> {
-        var currentSet = cacheSet.get()
+        val currentSet = cacheSet.get()
 
         // Check if the cached set is based on the current list
         if (currentSet != null) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt
index 629aef281..251cf0fa2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingAddressables.kt
@@ -40,7 +40,7 @@ fun potentialRelaysToFindAddress(note: AddressableNote): Set<NormalizedRelayUrl>
 
     LocalCache.getAnyChannel(note)?.relays()?.let { set.addAll(it) }
 
-    note.replyTo?.map { parentNote ->
+    note.replyTo?.forEach { parentNote ->
         set.addAll(parentNote.relays)
 
         LocalCache.getAnyChannel(parentNote)?.relays()?.let { set.addAll(it) }
@@ -48,7 +48,7 @@ fun potentialRelaysToFindAddress(note: AddressableNote): Set<NormalizedRelayUrl>
         parentNote.author?.inboxRelays()?.let { set.addAll(it) }
     }
 
-    note.replies.map { childNote ->
+    note.replies.forEach { childNote ->
         set.addAll(childNote.relays)
 
         LocalCache.getAnyChannel(childNote)?.relays()?.let { set.addAll(it) }
@@ -63,7 +63,7 @@ fun potentialRelaysToFindAddress(note: AddressableNote): Set<NormalizedRelayUrl>
         }
     }
 
-    note.boosts.map { childNote ->
+    note.boosts.forEach { childNote ->
         set.addAll(childNote.relays)
         childNote.author?.outboxRelays()?.let { set.addAll(it) }
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt
index b4f378205..1506da482 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/event/loaders/FilterMissingEvents.kt
@@ -36,7 +36,7 @@ fun potentialRelaysToFindEvent(note: Note): Set<NormalizedRelayUrl> {
 
     LocalCache.getAnyChannel(note)?.relays()?.let { set.addAll(it) }
 
-    note.replyTo?.map { parentNote ->
+    note.replyTo?.forEach { parentNote ->
         set.addAll(parentNote.relays)
 
         LocalCache.getAnyChannel(parentNote)?.relays()?.let { set.addAll(it) }
@@ -44,7 +44,7 @@ fun potentialRelaysToFindEvent(note: Note): Set<NormalizedRelayUrl> {
         parentNote.author?.inboxRelays()?.let { set.addAll(it) }
     }
 
-    note.replies.map { childNote ->
+    note.replies.forEach { childNote ->
         set.addAll(childNote.relays)
 
         LocalCache.getAnyChannel(childNote)?.relays()?.let { set.addAll(it) }
@@ -59,7 +59,7 @@ fun potentialRelaysToFindEvent(note: Note): Set<NormalizedRelayUrl> {
         }
     }
 
-    note.boosts.map { childNote ->
+    note.boosts.forEach { childNote ->
         set.addAll(childNote.relays)
         childNote.author?.outboxRelays()?.let { set.addAll(it) }
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/UserCardsSubAssembler.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/UserCardsSubAssembler.kt
index f749ea41d..19474b6c4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/UserCardsSubAssembler.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/user/watchers/UserCardsSubAssembler.kt
@@ -68,7 +68,7 @@ class UserCardsSubAssembler(
         val trustedAccounts: Map<NormalizedRelayUrl, Set<HexKey>> =
             mapOfSet {
                 accounts.forEach { account ->
-                    account.homeRelays.flow.value.map {
+                    account.homeRelays.flow.value.forEach {
                         add(it, account.userProfile().pubkeyHex)
                     }
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
index 281f797ae..c7396dd00 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NIP05VerificationDisplay.kt
@@ -167,7 +167,7 @@ fun ObserveAllStatusesToAvoidSwitchigAllTheTime(
     statuses: ImmutableList<AddressableNote>,
     accountViewModel: AccountViewModel,
 ) {
-    statuses.map {
+    statuses.forEach {
         EventFinderFilterAssemblerSubscription(it, accountViewModel)
     }
 }