diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php
index 28d904661e..a9cbb7127e 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -233,11 +233,7 @@ class Core
             return is_numeric($var);
         }
 
-        if (gettype($var) === $type) {
-            return true;
-        }
-
-        return false;
+        return gettype($var) === $type;
     }
 
     /**
@@ -807,11 +803,8 @@ class Core
             /* Following are doubtful ones. */
             'mysqldatabaseadministration.blogspot.com',
         );
-        if (in_array($domain, $domainWhiteList)) {
-            return true;
-        }
 
-        return false;
+        return in_array($domain, $domainWhiteList);
     }
 
     /**
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 142e5d8e9e..e2f76ed83f 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -144,10 +144,7 @@ class DatabaseInterface
      */
     public static function checkDbExtension($extension = 'mysql')
     {
-        if (function_exists($extension . '_connect')) {
-            return true;
-        }
-        return false;
+        return function_exists($extension . '_connect');
     }
 
     /**
diff --git a/libraries/classes/Display/ImportAjax.php b/libraries/classes/Display/ImportAjax.php
index acebebad3d..40c2d0a764 100644
--- a/libraries/classes/Display/ImportAjax.php
+++ b/libraries/classes/Display/ImportAjax.php
@@ -90,12 +90,8 @@ class ImportAjax
      */
     public static function progressCheck()
     {
-        if (! function_exists("uploadprogress_get_info")
-            || ! function_exists('getallheaders')
-        ) {
-            return false;
-        }
-        return true;
+        return function_exists("uploadprogress_get_info")
+            || function_exists('getallheaders');
     }
 
     /**
@@ -106,10 +102,7 @@ class ImportAjax
       */
     public static function sessionCheck()
     {
-        if (! ini_get('session.upload_progress.enabled')) {
-            return false;
-        }
-        return true;
+        return ini_get('session.upload_progress.enabled');
     }
 
     /**
diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
index 526cb1c721..becd8bfcc3 100644
--- a/libraries/classes/Gis/GisPolygon.php
+++ b/libraries/classes/Gis/GisPolygon.php
@@ -436,11 +436,7 @@ class GisPolygon extends GisGeometry
     {
         // If area is negative then it's in clockwise orientation,
         // i.e. it's an outer ring
-        if (GisPolygon::area($ring) < 0) {
-            return true;
-        }
-
-        return false;
+        return GisPolygon::area($ring) < 0;
     }
 
     /**
@@ -497,11 +493,7 @@ class GisPolygon extends GisGeometry
             $p1 = $p2;
         }
 
-        if ($counter % 2 == 0) {
-            return false;
-        }
-
-        return true;
+        return $counter % 2 != 0;
     }
 
     /**
diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index 639e0152ee..7456685401 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -1687,10 +1687,6 @@ class Import
 
         $result = $GLOBALS['dbi']->tryQuery($check_query);
 
-        if ($GLOBALS['dbi']->numRows($result) == 1) {
-            return true;
-        }
-
-        return false;
+        return $GLOBALS['dbi']->numRows($result) == 1;
     }
 }
diff --git a/libraries/classes/IpAllowDeny.php b/libraries/classes/IpAllowDeny.php
index 790db16e0c..dd3ea382ef 100644
--- a/libraries/classes/IpAllowDeny.php
+++ b/libraries/classes/IpAllowDeny.php
@@ -87,11 +87,7 @@ class IpAllowDeny
                 } // end if
             } // end for
 
-            if (($maskl & $rangel) == ($maskl & $ipl)) {
-                return true;
-            }
-
-            return false;
+            return ($maskl & $rangel) == ($maskl & $ipl);
         }
 
         // range based
diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php
index c958987146..21fd384327 100644
--- a/libraries/classes/Navigation/Nodes/Node.php
+++ b/libraries/classes/Navigation/Nodes/Node.php
@@ -664,13 +664,8 @@ class Node
      */
     private function _isHideDb($db)
     {
-        if (!empty($GLOBALS['cfg']['Server']['hide_db'])
-            && preg_match('/' . $GLOBALS['cfg']['Server']['hide_db'] . '/', $db)
-        ) {
-            return true;
-        }
-
-        return false;
+        return !empty($GLOBALS['cfg']['Server']['hide_db'])
+            && preg_match('/' . $GLOBALS['cfg']['Server']['hide_db'] . '/', $db);
     }
 
     /**
diff --git a/libraries/classes/Plugins/Auth/AuthenticationHttp.php b/libraries/classes/Plugins/Auth/AuthenticationHttp.php
index 7d56801084..3b8f0d8904 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationHttp.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationHttp.php
@@ -181,11 +181,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         }
 
         // Returns whether we get authentication settings or not
-        if (empty($this->user)) {
-            return false;
-        }
-
-        return true;
+        return !empty($this->user);
     }
 
     /**
diff --git a/libraries/classes/Plugins/Export/ExportHtmlword.php b/libraries/classes/Plugins/Export/ExportHtmlword.php
index dff0a88e0d..69fdf6ad6b 100644
--- a/libraries/classes/Plugins/Export/ExportHtmlword.php
+++ b/libraries/classes/Plugins/Export/ExportHtmlword.php
@@ -268,11 +268,8 @@ class ExportHtmlword extends ExportPlugin
             }
         } // end while
         $GLOBALS['dbi']->freeResult($result);
-        if (!Export::outputHandler('</table>')) {
-            return false;
-        }
 
-        return true;
+        return Export::outputHandler('</table>');
     }
 
     /**
diff --git a/libraries/classes/Plugins/Export/ExportOds.php b/libraries/classes/Plugins/Export/ExportOds.php
index 76ada18a05..ca822b7890 100644
--- a/libraries/classes/Plugins/Export/ExportOds.php
+++ b/libraries/classes/Plugins/Export/ExportOds.php
@@ -148,17 +148,13 @@ class ExportOds extends ExportPlugin
         $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
             . '</office:body>'
             . '</office:document-content>';
-        if (!Export::outputHandler(
+
+        return Export::outputHandler(
             OpenDocument::create(
                 'application/vnd.oasis.opendocument.spreadsheet',
                 $GLOBALS['ods_buffer']
             )
-        )
-        ) {
-            return false;
-        }
-
-        return true;
+        );
     }
 
     /**
diff --git a/libraries/classes/Plugins/Export/ExportPdf.php b/libraries/classes/Plugins/Export/ExportPdf.php
index d6ec52fcf4..ff08fbc9ab 100644
--- a/libraries/classes/Plugins/Export/ExportPdf.php
+++ b/libraries/classes/Plugins/Export/ExportPdf.php
@@ -151,11 +151,7 @@ class ExportPdf extends ExportPlugin
         $pdf = $this->_getPdf();
 
         // instead of $pdf->Output():
-        if (!Export::outputHandler($pdf->getPDFData())) {
-            return false;
-        }
-
-        return true;
+        return Export::outputHandler($pdf->getPDFData());
     }
 
     /**
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
index 9ac6aba5a7..cb993bd492 100644
--- a/libraries/classes/Plugins/Export/ExportSql.php
+++ b/libraries/classes/Plugins/Export/ExportSql.php
@@ -2189,11 +2189,7 @@ class ExportSql extends ExportPlugin
                 . $this->_exportComment()
                 . $this->_possibleCRLF();
 
-            if (!Export::outputHandler($head)) {
-                return false;
-            }
-
-            return true;
+            return Export::outputHandler($head);
         }
 
         $result = $GLOBALS['dbi']->tryQuery(
diff --git a/libraries/classes/Plugins/Export/Helpers/Pdf.php b/libraries/classes/Plugins/Export/Helpers/Pdf.php
index b6abd97707..f64a24bbe6 100644
--- a/libraries/classes/Plugins/Export/Helpers/Pdf.php
+++ b/libraries/classes/Plugins/Export/Helpers/Pdf.php
@@ -75,12 +75,9 @@ class Pdf extends PdfLib
 
             return true;
         }
-        if ($current_page != $this->page) {
-            // account for columns mode
-            return true;
-        }
 
-        return false;
+        // account for columns mode
+        return $current_page != $this->page;
     }
 
     /**
diff --git a/libraries/classes/ThemeManager.php b/libraries/classes/ThemeManager.php
index 0298f2a558..9d7ff2c2de 100644
--- a/libraries/classes/ThemeManager.php
+++ b/libraries/classes/ThemeManager.php
@@ -318,11 +318,7 @@ class ThemeManager
      */
     public function checkTheme($theme)
     {
-        if (! array_key_exists($theme, $this->themes)) {
-            return false;
-        }
-
-        return true;
+        return array_key_exists($theme, $this->themes);
     }
 
     /**
diff --git a/libraries/classes/Tracker.php b/libraries/classes/Tracker.php
index ddc1a1ceaf..f6ce6cda3e 100644
--- a/libraries/classes/Tracker.php
+++ b/libraries/classes/Tracker.php
@@ -78,11 +78,8 @@ class Tracker
         }
 
         $pma_table = self::_getTrackingTable();
-        if (isset($pma_table)) {
-            return true;
-        }
 
-        return false;
+        return isset($pma_table);
     }
 
     /**
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 28c429133c..9ff15ae004 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -310,11 +310,7 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
      */
     public function isSuccessLogin()
     {
-        if ($this->isElementPresent("byXPath", "//*[@id=\"serverinfo\"]")) {
-            return true;
-        } else {
-            return false;
-        }
+        return $this->isElementPresent("byXPath", "//*[@id=\"serverinfo\"]");
     }
 
     /**
@@ -324,11 +320,7 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
     */
     public function isUnsuccessLogin()
     {
-        if ($this->isElementPresent("byCssSelector", "div.error")) {
-            return true;
-        } else {
-            return false;
-        }
+        return $this->isElementPresent("byCssSelector", "div.error");
     }
 
     /**
@@ -587,16 +579,10 @@ abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
         $this->waitForElement('byCssSelector', 'li.submenuhover > a');
 
         $this->waitUntil(function () {
-            if (
-                $this->isElementPresent(
-                    'byCssSelector',
-                    'li.submenuhover.submenu.shown'
-                )
-            ) {
-                return true;
-            }
-
-            return false;
+            return $this->isElementPresent(
+                'byCssSelector',
+                'li.submenuhover.submenu.shown'
+            );
         }, 5000);
     }