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 6917be928..f394fec57 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -1240,7 +1240,7 @@ class Account(
         val event = signer.sign(template)
         cache.justConsumeMyOwnEvent(event)
         val relays = relayList(event)
-        if (relays != null && relays.isNotEmpty()) {
+        if (!relays.isNullOrEmpty()) {
             client.send(event, relays.toSet())
         } else {
             client.send(event, computeRelayListToBroadcast(event))
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt
index 08cbe1654..e4525e953 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/drafts/FilterDraftsAndReportsFromKey.kt
@@ -36,7 +36,7 @@ fun filterDraftsFromKey(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/FilterFindFollowMetadataForKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/FilterFindFollowMetadataForKey.kt
index efbc76b80..4db9ea1e5 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/FilterFindFollowMetadataForKey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/follows/FilterFindFollowMetadataForKey.kt
@@ -92,7 +92,7 @@ fun pickRelaysToLoadUsers(
 
             val outbox = key.authorRelayList()?.writeRelaysNorm()
 
-            if (outbox != null && outbox.isNotEmpty()) {
+            if (!outbox.isNullOrEmpty()) {
                 // If there is a home, get from it.
 
                 // if it tried all outbox relays, stop.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt
index 6d78b6a09..f680b4c0a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt
@@ -70,7 +70,7 @@ fun filterBasicAccountInfoFromKeys(
     otherAccounts: List<HexKey>?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (otherAccounts == null || otherAccounts.isEmpty()) return emptyList()
+    if (otherAccounts.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt
index 4ede695a3..cc8ebc0b8 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBookmarksAndReportsFromKey.kt
@@ -38,7 +38,7 @@ fun filterBookmarksAndReportsFromKey(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt
index 02c02efc3..bf7c6659f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip01Notifications/FilterNotificationsToPubkey.kt
@@ -90,7 +90,7 @@ fun filterSummaryNotificationsToPubkey(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
@@ -111,7 +111,7 @@ fun filterNotificationsToPubkey(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
@@ -142,7 +142,7 @@ fun filterJustTheLatestNotificationsToPubkeyFromRandomRelays(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/FilterGiftWrapsToPubkey.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/FilterGiftWrapsToPubkey.kt
index 03481eeae..081f2e486 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/FilterGiftWrapsToPubkey.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/FilterGiftWrapsToPubkey.kt
@@ -32,7 +32,7 @@ fun filterGiftWrapsToPubkey(
     pubkey: HexKey?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (pubkey == null || pubkey.isEmpty()) return emptyList()
+    if (pubkey.isNullOrEmpty()) return emptyList()
 
     return listOf(
         RelayBasedFilter(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt
index 1a50d6e23..bf760560e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/ReplyInformation.kt
@@ -86,8 +86,8 @@ fun ReplyInformationChannel(
     onUserTagClick: (User) -> Unit,
 ) {
     FlowRow {
-        if (mentions != null && mentions.isNotEmpty()) {
-            if (replyTo != null && replyTo.isNotEmpty()) {
+        if (!mentions.isNullOrEmpty()) {
+            if (!replyTo.isNullOrEmpty()) {
                 Text(
                     stringRes(id = R.string.replying_to),
                     fontSize = 13.sp,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/FilterNip04DMs.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/FilterNip04DMs.kt
index 1f7540e45..ec277266d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/FilterNip04DMs.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/datasource/FilterNip04DMs.kt
@@ -35,7 +35,7 @@ fun filterNip04DMs(
     account: Account?,
     since: SincePerRelayMap?,
 ): List<RelayBasedFilter>? {
-    if (group == null || group.isEmpty() || account == null) return null
+    if (group.isNullOrEmpty() || account == null) return null
 
     val userOutboxRelays = account.homeRelays.flow.value
     val userInboxRelays = account.dmRelays.flow.value
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
index aaa510974..108f67fd4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
@@ -596,7 +596,7 @@ class ChatNewMessageViewModel :
             toUsersTagger.run()
 
             val users = toUsersTagger.pTags?.mapTo(mutableSetOf()) { it.pubkeyHex }
-            if (users == null || users.isEmpty()) {
+            if (users.isNullOrEmpty()) {
                 room = null
                 updateNIP17StatusFromRoom()
             } else {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt
index a45973b3b..f5b4a505b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip72Communities/subassemblies/FilterCommunitiesByHashtag.kt
@@ -34,7 +34,7 @@ fun filterCommunitiesByHashtag(
     hashtags: Set<String>?,
     since: Long?,
 ): List<RelayBasedFilter> {
-    if (hashtags == null || hashtags.isEmpty()) return emptyList()
+    if (hashtags.isNullOrEmpty()) return emptyList()
 
     val hashtags = hashtags.flatMap(::hashtagAlts).distinct().sorted()
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt
index bc425ba1b..bf227d5e0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/subassemblies/FilterClassifiedsByHashtag.kt
@@ -33,7 +33,7 @@ fun filterClassifiedsByHashtag(
     hashtags: Set<String>?,
     since: Long?,
 ): List<RelayBasedFilter>? {
-    if (hashtags == null || hashtags.isEmpty()) return null
+    if (hashtags.isNullOrEmpty()) return null
 
     val hashtags = hashtags.flatMap(::hashtagAlts).distinct().sorted()
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
index c86825e77..583349d0d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/threadview/ThreadFeedView.kt
@@ -842,7 +842,7 @@ private fun RenderClassifiedsReaderForThread(
 
     Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, bottom = 12.dp)) {
         Column {
-            if (imageSet != null && imageSet.isNotEmpty()) {
+            if (!imageSet.isNullOrEmpty()) {
                 AutoNonlazyGrid(imageSet.size) {
                     ZoomableContentView(
                         content = imageSet[it],