diff --git a/includes/MinervaHooks.php b/includes/MinervaHooks.php
index 93ddbf9..ea2c327 100644
--- a/includes/MinervaHooks.php
+++ b/includes/MinervaHooks.php
@@ -93,10 +93,10 @@ class MinervaHooks {
 	 * @see https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules
 	 *
 	 * @param array &$testModules
-	 * @param ResourceLoader &$resourceLoader
+	 * @param ResourceLoader $resourceLoader
 	 */
 	public static function onResourceLoaderTestModules( array &$testModules,
-		ResourceLoader &$resourceLoader
+		ResourceLoader $resourceLoader
 	) {
 		$testModule = [
 			'dependencies' => [
@@ -118,9 +118,9 @@ class MinervaHooks {
 				'resources/skins.minerva.scripts/page-issues/overlay/IssueNotice.js',
 				'resources/skins.minerva.scripts/page-issues/overlay/IssueList.js',
 				'resources/skins.minerva.scripts/page-issues/overlay/pageIssuesOverlay.js',
-				"resources/skins.minerva.scripts/page-issues/page/PageIssueLearnMoreLink.js",
-				"resources/skins.minerva.scripts/page-issues/page/PageIssueLink.js",
-				"resources/skins.minerva.scripts/page-issues/page/pageIssueFormatter.js",
+				'resources/skins.minerva.scripts/page-issues/page/PageIssueLearnMoreLink.js',
+				'resources/skins.minerva.scripts/page-issues/page/PageIssueLink.js',
+				'resources/skins.minerva.scripts/page-issues/page/pageIssueFormatter.js',
 				'resources/skins.minerva.scripts/pageIssues.js',
 				'resources/skins.minerva.scripts/UriUtil.js',
 				'resources/skins.minerva.scripts/TitleUtil.js',
@@ -136,7 +136,7 @@ class MinervaHooks {
 		];
 
 		// Expose templates module
-		$testModules['qunit']["tests.skins.minerva"] = $testModule;
+		$testModules['qunit']['tests.skins.minerva'] = $testModule;
 	}
 
 	/**
@@ -170,7 +170,7 @@ class MinervaHooks {
 					// Add default warning message to Special:UserLogin and Special:UserCreate
 					// if no warning message set.
 					if (
-						!$request->getVal( 'warning', null ) &&
+						!$request->getVal( 'warning' ) &&
 						!$special->getUser()->isLoggedIn() &&
 						!$request->wasPosted()
 					) {
diff --git a/includes/skins/MinervaTemplate.php b/includes/skins/MinervaTemplate.php
index 0481488..5fb2b50 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -128,9 +128,9 @@ class MinervaTemplate extends BaseTemplate {
 			] + $data['historyLink'];
 			$templateParser = new TemplateParser( __DIR__ );
 			return $templateParser->processTemplate( 'history', $args );
-		} else {
-			return '';
 		}
+
+		return '';
 	}
 
 	/**
@@ -159,7 +159,7 @@ class MinervaTemplate extends BaseTemplate {
 	 */
 	protected function getSecondaryActionsHtml() {
 		$baseClass = MinervaUI::buttonClass( '', 'button' );
-		/** @var $skin SkinMinerva $skin */
+		/** @var SkinMinerva $skin */
 		$skin = $this->getSkin();
 		$html = '';
 		// no secondary actions on the user page
@@ -193,9 +193,9 @@ class MinervaTemplate extends BaseTemplate {
 				$content .= $data['subject-page'];
 			}
 			return $content . Html::closeElement( 'div' );
-		} else {
-			return $data[ 'bodytext' ];
 		}
+
+		return $data[ 'bodytext' ];
 	}
 
 	/**
@@ -210,9 +210,9 @@ class MinervaTemplate extends BaseTemplate {
 				__DIR__ . '/../../resources/skins.minerva.scripts/menu/' );
 
 			return $templateParser->processTemplate( 'menu', $data['menu_data'] );
-		} else {
-			return '';
 		}
+
+		return '';
 	}
 
 	/**
@@ -239,7 +239,7 @@ class MinervaTemplate extends BaseTemplate {
 			'headelement' => $data[ 'headelement' ],
 			'menuButton' => $data['menuButton'],
 			'siteheading' => $data['footer-site-heading-html'],
-			'mainPageURL' => Title::newMainPage()->getLocalUrl(),
+			'mainPageURL' => Title::newMainPage()->getLocalURL(),
 			// A button when clicked will submit the form
 			// This is used so that on tablet devices with JS disabled the search button
 			// passes the value of input to the search