diff --git a/plinth/setup.py b/plinth/setup.py
index e633e2761..ba8d0c513 100644
--- a/plinth/setup.py
+++ b/plinth/setup.py
@@ -145,8 +145,8 @@ class Helper(object):
 
         if not current_version:
             return 'needs-setup'
-        else:
-            return 'needs-update'
+
+        return 'needs-update'
 
     def get_setup_version(self):
         """Return the setup version of a module."""
diff --git a/plinth/views.py b/plinth/views.py
index b31d5cd36..5d12e5863 100644
--- a/plinth/views.py
+++ b/plinth/views.py
@@ -203,9 +203,9 @@ class SetupView(TemplateView):
                 response.status_code = 303
                 return response
 
-            elif 'refresh-packages' in request.POST:
+            if 'refresh-packages' in request.POST:
                 # Refresh apt package lists
                 package.refresh_package_lists()
                 return self.render_to_response(self.get_context_data())
-        else:
-            return super(SetupView, self).dispatch(request, *args, **kwargs)
+
+        return super(SetupView, self).dispatch(request, *args, **kwargs)