diff --git a/.phpcs.xml b/.phpcs.xml
index b3fd5440c..b915cf830 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
-	</rule>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
 	<file>.</file>
 	<arg name="extensions" value="php"/>
 	<arg name="encoding" value="UTF-8"/>
diff --git a/includes/Menu/User/UserMenuDirector.php b/includes/Menu/User/UserMenuDirector.php
index bc58b7c28..0cfd3b35d 100644
--- a/includes/Menu/User/UserMenuDirector.php
+++ b/includes/Menu/User/UserMenuDirector.php
@@ -62,7 +62,7 @@ final class UserMenuDirector {
 			: $templateParser->processTemplate( 'ToggleList', [
 				'class' => 'minerva-user-menu',
 				'checkboxID' => $checkboxID,
-				'toggleID' => $toggleID, // See skin.mustache too.
+				'toggleID' => $toggleID,
 				'data-btn' => [
 					'tag-name' => 'label',
 					'data-icon' => [
@@ -90,7 +90,8 @@ final class UserMenuDirector {
 					'label' => $this->localizer->msg( 'minerva-user-menu-button' )->escaped(),
 				],
 				'listID' => $group->getId(),
-				'listClass' => 'minerva-user-menu-list toggle-list__list--drop-down', // See ToggleList/*.less.
+				// See ToggleList/*.less.
+				'listClass' => 'minerva-user-menu-list toggle-list__list--drop-down',
 				'items' => $entries
 			] );
 	}
diff --git a/includes/Skins/SkinMinerva.php b/includes/Skins/SkinMinerva.php
index 1bbcb571d..b3ad2799f 100644
--- a/includes/Skins/SkinMinerva.php
+++ b/includes/Skins/SkinMinerva.php
@@ -136,10 +136,10 @@ class SkinMinerva extends SkinMustache {
 	 */
 	private function getNotificationFallbackButton() {
 		return [
-				'icon' => 'bellOutline-base20',
-				'href' => SpecialPage::getTitleFor( 'Mytalk' )->getLocalURL(
-						[ 'returnto' => $this->getTitle()->getPrefixedText() ]
-				),
+			'icon' => 'bellOutline-base20',
+			'href' => SpecialPage::getTitleFor( 'Mytalk' )->getLocalURL(
+				[ 'returnto' => $this->getTitle()->getPrefixedText() ]
+			),
 		];
 	}
 
@@ -538,7 +538,8 @@ class SkinMinerva extends SkinMustache {
 				case NS_FILE_TALK:
 					$msg = 'mobile-frontend-talk-back-to-filepage';
 					break;
-				default: // generic (all other NS)
+				default:
+					// generic (all other NS)
 					$msg = 'mobile-frontend-talk-back-to-page';
 			}
 			$subjectPage = $services->getNamespaceInfo()->getSubjectPage( $title );