diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
index 4eba0cb07..da9cc9ae5 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
@@ -65,14 +65,11 @@ class LightningAddressResolver {
         okHttpClient: (String) -> OkHttpClient,
         context: Context,
     ): String {
-        val url = assembleUrl(lnAddress)
-
-        if (url == null) {
-            throw LightningAddressError(
+        val url =
+            assembleUrl(lnAddress) ?: throw LightningAddressError(
                 stringRes(context, R.string.error_unable_to_fetch_invoice),
                 stringRes(context, R.string.could_not_assemble_lnurl_from_lightning_address_check_the_user_s_setup, lnAddress),
             )
-        }
 
         val client = okHttpClient(url)
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
index 146d532e8..9f2ad864a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/OkHttpWebSocket.kt
@@ -48,8 +48,7 @@ class OkHttpWebSocket(
     override fun needsReconnect(): Boolean {
         if (socket == null) return true
 
-        val myUsingOkHttp = usingOkHttp
-        if (myUsingOkHttp == null) return true
+        val myUsingOkHttp = usingOkHttp ?: return true
 
         val currentOkHttp = httpClient(url)
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt
index 68ad9f137..883366290 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip53LiveActivities/DiscoverLiveFeedFilter.kt
@@ -117,8 +117,7 @@ open class DiscoverLiveFeedFilter(
 
     fun convertStatusToOrder(event: LiveActivitiesEvent?): Int {
         if (event == null) return 0
-        val url = event.streaming()
-        if (url == null) return 0
+        val url = event.streaming() ?: return 0
         return when (event.status()) {
             StatusTag.STATUS.LIVE -> {
                 if (OnlineChecker.isCachedAndOffline(url)) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeLiveFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeLiveFilter.kt
index 504c4d10b..2938ad1a6 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeLiveFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/dal/HomeLiveFilter.kt
@@ -160,10 +160,8 @@ class HomeLiveFilter(
         val noteEvent = note.event
 
         if (noteEvent is LiveActivitiesChatMessageEvent) {
-            val stream = noteEvent.activityAddress()
-            if (stream == null) return false
-            val streamChannel = LocalCache.getLiveActivityChannelIfExists(stream)
-            if (streamChannel == null) return false
+            val stream = noteEvent.activityAddress() ?: return false
+            val streamChannel = LocalCache.getLiveActivityChannelIfExists(stream) ?: return false
 
             if (streamChannel.info?.status() != StatusTag.STATUS.LIVE) return false
         }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/bookmarks/dal/UserProfileBookmarksFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/bookmarks/dal/UserProfileBookmarksFeedFilter.kt
index f95b460c9..53fd1cf33 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/bookmarks/dal/UserProfileBookmarksFeedFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/bookmarks/dal/UserProfileBookmarksFeedFilter.kt
@@ -37,9 +37,7 @@ class UserProfileBookmarksFeedFilter(
 
     override fun feed(): List<Note> {
         val note = LocalCache.getOrCreateAddressableNote(BookmarkListEvent.createBookmarkAddress(user.pubkeyHex))
-        val noteEvent = note.event as? BookmarkListEvent
-
-        if (noteEvent == null) return emptyList()
+        val noteEvent = note.event as? BookmarkListEvent ?: return emptyList()
 
         val notes =
             noteEvent.publicBookmarks().mapNotNull {