diff --git a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
index c24e02c20..de6b54bac 100644
--- a/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
+++ b/app/src/main/java/com/github/libretube/services/OnlinePlayerService.kt
@@ -172,8 +172,7 @@ class OnlinePlayerService : LifecycleService() {
             if (PlayingQueue.isEmpty()) {
                 PlayingQueue.updateQueue(streams!!.toStreamItem(videoId), playlistId, channelId)
                 insertRelatedStreamsToQueue()
-            }
-            else if (PlayingQueue.isLast() && playlistId == null && channelId == null) {
+            } else if (PlayingQueue.isLast() && playlistId == null && channelId == null) {
                 insertRelatedStreamsToQueue()
             }
 
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 02c40caf9..87bf103e6 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
index 42a1707d4..61ba7db80 100644
--- a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
@@ -31,7 +31,10 @@ object PlayingQueue {
         for (stream in streamItem) {
             if (skipExisting && contains(stream)) continue
             if (currentStream?.url?.toID() == stream.url?.toID() ||
-                stream.title.isNullOrBlank()) continue
+                stream.title.isNullOrBlank()
+            ) {
+                continue
+            }
             // remove if already present
             queue.remove(stream)
             queue.add(stream)
@@ -187,9 +190,13 @@ object PlayingQueue {
     }
 
     fun updateQueue(streamItem: StreamItem, playlistId: String?, channelId: String?) {
-        if (playlistId != null) insertPlaylist(playlistId, streamItem)
-        else if (channelId != null) insertChannel(channelId, streamItem)
-        else updateCurrent(streamItem)
+        if (playlistId != null) {
+            insertPlaylist(playlistId, streamItem)
+        } else if (channelId != null) {
+            insertChannel(channelId, streamItem)
+        } else {
+            updateCurrent(streamItem)
+        }
     }
 
     fun onQueueItemSelected(index: Int) {