diff --git a/jellyfin_kodi/jellyfin/connection_manager.py b/jellyfin_kodi/jellyfin/connection_manager.py
index f5eb05e5..05ed79b4 100644
--- a/jellyfin_kodi/jellyfin/connection_manager.py
+++ b/jellyfin_kodi/jellyfin/connection_manager.py
@@ -260,8 +260,8 @@ class ConnectionManager(object):
             }
 
             servers.append(info)
-        else:
-            return servers
+        
+        return servers
 
     # TODO: Make IPv6 compatable
     def _convert_endpoint_address_to_manual_address(self, info):
diff --git a/jellyfin_kodi/jellyfin/credentials.py b/jellyfin_kodi/jellyfin/credentials.py
index aa725ab6..42e708a9 100644
--- a/jellyfin_kodi/jellyfin/credentials.py
+++ b/jellyfin_kodi/jellyfin/credentials.py
@@ -111,9 +111,9 @@ class Credentials(object):
                     existing['ConnectServerId'] = server['ConnectServerId']
 
                 return existing
-        else:
-            servers.append(server)
-            return server
+        
+        servers.append(server)
+        return server
 
     def _date_object(self, date):
         # Convert string to date
diff --git a/jellyfin_kodi/views.py b/jellyfin_kodi/views.py
index 4f43992f..3d574cd7 100644
--- a/jellyfin_kodi/views.py
+++ b/jellyfin_kodi/views.py
@@ -242,8 +242,8 @@ class Views(object):
                             temp_view['Media'] = media
                             self.add_playlist(playlist_path, temp_view, True)
                             self.add_nodes(node_path, temp_view, True)
-                        else:  # Compensate for the duplicate.
-                            index += 1
+                        
+                        index += 1 # Compensate for the duplicate.
                     else:
                         if view['Media'] in ('movies', 'tvshows', 'musicvideos'):
                             self.add_playlist(playlist_path, view)
@@ -743,9 +743,10 @@ class Views(object):
                                 temp_view['Name'] = "%s (%s)" % (view['Name'], translate(media))
                                 self.window_node(index, temp_view, *node)
                                 self.window_wnode(windex, temp_view, *node)
-                            else:  # Add one to compensate for the duplicate.
-                                index += 1
-                                windex += 1
+
+                            # Add one to compensate for the duplicate.
+                            index += 1
+                            windex += 1
                     else:
                         for node in NODES[view['Media']]:
 
diff --git a/service.py b/service.py
index 5b8447a1..353cc58a 100644
--- a/service.py
+++ b/service.py
@@ -25,7 +25,7 @@ from helper import LazyLogger  # noqa: F402
 #################################################################################################
 
 LOG = LazyLogger(__name__)
-DELAY = int(settings('startupDelay') if settings('SyncInstallRunDone.bool') else 4 or 0)
+DELAY = int(settings('startupDelay') if settings('SyncInstallRunDone.bool') else 4)
 
 #################################################################################################