diff --git a/libraries/classes/Export.php b/libraries/classes/Export.php
index 4dc91def5f..88e90f0e2f 100644
--- a/libraries/classes/Export.php
+++ b/libraries/classes/Export.php
@@ -60,16 +60,11 @@ class Export
         $chromeAndGreaterThan43 = PMA_USR_BROWSER_AGENT == 'CHROME'
             && PMA_USR_BROWSER_VER >= 43; // see bug #4942
 
-        if (function_exists('gzencode')
+        return function_exists('gzencode')
             && ((! ini_get('zlib.output_compression')
-            && ! $this->isGzHandlerEnabled())
-            || $GLOBALS['save_on_server']
-            || $chromeAndGreaterThan43)
-        ) {
-            return true;
-        }
-
-        return false;
+                    && ! $this->isGzHandlerEnabled())
+                || $GLOBALS['save_on_server']
+                || $chromeAndGreaterThan43);
     }
 
     /**
diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index 60bfe8a967..dfe628858c 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -2180,7 +2180,7 @@ class Relation
      */
     public function arePmadbTablesDefined()
     {
-        if (empty($GLOBALS['cfg']['Server']['bookmarktable'])
+        return ! (empty($GLOBALS['cfg']['Server']['bookmarktable'])
             || empty($GLOBALS['cfg']['Server']['relation'])
             || empty($GLOBALS['cfg']['Server']['table_info'])
             || empty($GLOBALS['cfg']['Server']['table_coords'])
@@ -2198,12 +2198,7 @@ class Relation
             || empty($GLOBALS['cfg']['Server']['savedsearches'])
             || empty($GLOBALS['cfg']['Server']['central_columns'])
             || empty($GLOBALS['cfg']['Server']['designer_settings'])
-            || empty($GLOBALS['cfg']['Server']['export_templates'])
-        ) {
-            return false;
-        }
-
-        return true;
+            || empty($GLOBALS['cfg']['Server']['export_templates']));
     }
 
     /**