diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 30531806e..1b6f73698 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -92,7 +92,7 @@ class Twig
 
             // handle language templates if available
             if ($language->enabled()) {
-                $lang_templates = $locator->findResource('theme://templates/' . ($active_language ? $active_language : $language->getDefault()));
+                $lang_templates = $locator->findResource('theme://templates/' . ($active_language ?: $language->getDefault()));
                 if ($lang_templates) {
                     $this->twig_paths[] = $lang_templates;
                 }
@@ -118,7 +118,7 @@ class Twig
 
                 // handle language templates if available
                 if ($language->enabled()) {
-                    $lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ? $active_language : $language->getDefault()));
+                    $lang_templates = $locator->findResource('theme://'.$prefix.'templates/' . ($active_language ?: $language->getDefault()));
                     if ($lang_templates) {
                         $twig_paths[] = $lang_templates;
                     }
@@ -160,7 +160,7 @@ class Twig
                         return new TwigFunction($name, $name);
                     }
 
-                    return new TwigFunction($name, function () {
+                    return new TwigFunction($name, static function () {
                     });
                 });
             }
@@ -171,7 +171,7 @@ class Twig
                         return new TwigFilter($name, $name);
                     }
 
-                    return new TwigFilter($name, function () {
+                    return new TwigFilter($name, static function () {
                     });
                 });
             }
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index 0e8a25951..157bee473 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -631,7 +631,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
         }
 
         $results = Security::detectXssFromArray($data);
-        $results_parts = array_map(function ($value, $key) {
+        $results_parts = array_map(static function ($value, $key) {
             return $key.': \''.$value . '\'';
         }, array_values($results), array_keys($results));
 
@@ -1364,10 +1364,9 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
                 if (isset($value)) {
                     if ($exists) {
                         return $page;
-                    } else {
-                        return $value;
                     }
 
+                    return $value;
                 }
                 $page = $page->parent();
             }
@@ -1375,9 +1374,9 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
 
         if ($exists) {
             return false;
-        } else {
-            return Grav::instance()['config']->get('theme.' . $var, $default);
         }
+
+        return Grav::instance()['config']->get('theme.' . $var, $default);
     }
 
     /**
@@ -1470,6 +1469,8 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
 
             return $svg;
         }
+
+        return null;
     }