diff --git a/code/extensions/GroupSubsites.php b/code/extensions/GroupSubsites.php
index 58315e1..5d6a112 100644
--- a/code/extensions/GroupSubsites.php
+++ b/code/extensions/GroupSubsites.php
@@ -126,10 +126,10 @@ class GroupSubsites extends DataExtension implements PermissionProvider
         if ($this->owner->AccessAllSubsites) {
             $title = _t('GroupSubsites.GlobalGroup', 'global group');
             return htmlspecialchars($this->owner->Title, ENT_QUOTES) . ' <i>(' . $title . ')</i>';
-        } else {
-            $subsites = Convert::raw2xml(implode(', ', $this->owner->Subsites()->column('Title')));
-            return htmlspecialchars($this->owner->Title) . " <i>($subsites)</i>";
         }
+
+        $subsites = Convert::raw2xml(implode(', ', $this->owner->Subsites()->column('Title')));
+        return htmlspecialchars($this->owner->Title) . " <i>($subsites)</i>";
     }
 
     /**
diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php
index 7eb5c05..9d02cc5 100644
--- a/code/extensions/LeftAndMainSubsites.php
+++ b/code/extensions/LeftAndMainSubsites.php
@@ -170,11 +170,11 @@ class LeftAndMainSubsites extends Extension
         if (Subsite::currentSubsiteID() == 0) {
             // Main site always supports everything.
             return true;
-        } else {
-            $controller = singleton($controllerName);
-            if ($controller->hasMethod('subsiteCMSShowInMenu') && $controller->subsiteCMSShowInMenu()) {
-                return true;
-            }
+        }
+
+        $controller = singleton($controllerName);
+        if ($controller->hasMethod('subsiteCMSShowInMenu') && $controller->subsiteCMSShowInMenu()) {
+            return true;
         }
 
         // It's not necessary to check access permissions here. Framework calls canView on the controller,
diff --git a/code/model/Subsite.php b/code/model/Subsite.php
index bba27e6..2aa6c2a 100644
--- a/code/model/Subsite.php
+++ b/code/model/Subsite.php
@@ -740,20 +740,20 @@ class Subsite extends DataObject
     {
         if ($themes = $this->stat('allowed_themes')) {
             return ArrayLib::valuekey($themes);
-        } else {
-            $themes = [];
-            if (is_dir(THEMES_PATH)) {
-                foreach (scandir(THEMES_PATH) as $theme) {
-                    if ($theme[0] == '.') {
-                        continue;
-                    }
-                    $theme = strtok($theme, '_');
-                    $themes[$theme] = $theme;
-                }
-                ksort($themes);
-            }
-            return $themes;
         }
+
+        $themes = [];
+        if (is_dir(THEMES_PATH)) {
+            foreach (scandir(THEMES_PATH) as $theme) {
+                if ($theme[0] == '.') {
+                    continue;
+                }
+                $theme = strtok($theme, '_');
+                $themes[$theme] = $theme;
+            }
+            ksort($themes);
+        }
+        return $themes;
     }
 
     /**
@@ -763,9 +763,9 @@ class Subsite extends DataObject
     {
         if ($this->getField('Language')) {
             return $this->getField('Language');
-        } else {
-            return i18n::get_locale();
         }
+
+        return i18n::get_locale();
     }
 
     /**