diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 3b65d75b5..6917be928 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -1898,7 +1898,7 @@ class Account(
     fun getRelevantReports(note: Note): Set<Note> {
         val innerReports =
             if (note.event is RepostEvent || note.event is GenericRepostEvent) {
-                note.replyTo?.map { getRelevantReports(it) }?.flatten() ?: emptyList()
+                note.replyTo?.flatMap { getRelevantReports(it) } ?: emptyList()
             } else {
                 emptyList()
             }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 0f637f3ed..7e8a21219 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -2770,10 +2770,9 @@ object LocalCache : ILocalCache, ICacheProvider {
         val childrenToBeRemoved = mutableListOf<Note>()
 
         val toBeRemoved =
-            account.hiddenUsers.flow.value.hiddenUsers
-                .map { userHex ->
-                    (notes.filter { _, it -> it.event?.pubKey == userHex } + addressables.filter { _, it -> it.event?.pubKey == userHex }).toSet()
-                }.flatten()
+            account.hiddenUsers.flow.value.hiddenUsers.flatMap { userHex ->
+                (notes.filter { _, it -> it.event?.pubKey == userHex } + addressables.filter { _, it -> it.event?.pubKey == userHex }).toSet()
+            }
 
         toBeRemoved.forEach {
             removeFromCache(it)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
index 59ea44a51..b23559684 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/AudioWaveformReadOnly.kt
@@ -170,7 +170,7 @@ internal fun <T> Iterable<T>.fillToSize(
     transform: (List<T>) -> T,
 ): List<T> {
     val capacity = ceil(size.safeDiv(count())).roundToInt()
-    return map { data -> List(capacity) { data } }.flatten().chunkToSize(size, transform)
+    return flatMap { data -> List(capacity) { data } }.chunkToSize(size, transform)
 }
 
 internal fun <T> Iterable<T>.chunkToSize(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt
index 11f573256..c63cd5a5c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/elements/DisplayUncitedHashtags.kt
@@ -66,15 +66,15 @@ fun DisplayUncitedHashtags(
                 val tagsInContent =
                     state
                         .paragraphs
-                        .map {
-                            it.words.mapNotNull {
+                        .flatMap { paragraphState ->
+                            paragraphState.words.mapNotNull {
                                 if (it is HashTagSegment) {
                                     it.hashtag
                                 } else {
                                     null
                                 }
                             }
-                        }.flatten()
+                        }
 
                 val unusedHashtags =
                     tagsInEvent.filterNot { eventTag ->
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt
index f36547074..d95d5f51b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/datasource/FilterUserProfilePosts.kt
@@ -76,29 +76,28 @@ fun filterUserProfilePosts(
         user.outboxRelays()?.ifEmpty { null }
             ?: (user.allUsedRelays() + LocalCache.relayHints.hintsForKey(user.pubkeyHex))
 
-    return relays
-        .map { relay ->
-            listOf(
-                RelayBasedFilter(
-                    relay = relay,
-                    filter =
-                        Filter(
-                            kinds = UserProfilePostKinds1,
-                            authors = listOf(user.pubkeyHex),
-                            limit = 500,
-                            since = since?.get(relay)?.time,
-                        ),
-                ),
-                RelayBasedFilter(
-                    relay = relay,
-                    filter =
-                        Filter(
-                            kinds = UserProfilePostKinds2,
-                            authors = listOf(user.pubkeyHex),
-                            limit = 50,
-                            since = since?.get(relay)?.time,
-                        ),
-                ),
-            )
-        }.flatten()
+    return relays.flatMap { relay ->
+        listOf(
+            RelayBasedFilter(
+                relay = relay,
+                filter =
+                    Filter(
+                        kinds = UserProfilePostKinds1,
+                        authors = listOf(user.pubkeyHex),
+                        limit = 500,
+                        since = since?.get(relay)?.time,
+                    ),
+            ),
+            RelayBasedFilter(
+                relay = relay,
+                filter =
+                    Filter(
+                        kinds = UserProfilePostKinds2,
+                        authors = listOf(user.pubkeyHex),
+                        limit = 50,
+                        since = since?.get(relay)?.time,
+                    ),
+            ),
+        )
+    }
 }