diff --git a/CiteThisPage.hooks.php b/CiteThisPage.hooks.php
index 7f7572f7..c38c164b 100644
--- a/CiteThisPage.hooks.php
+++ b/CiteThisPage.hooks.php
@@ -3,10 +3,10 @@
 class CiteThisPageHooks {
 
 	/**
-	 * @param SkinTemplate $skintemplate
-	 * @param $nav_urls
-	 * @param $oldid
-	 * @param $revid
+	 * @param SkinTemplate &$skintemplate
+	 * @param array &$nav_urls
+	 * @param int &$oldid
+	 * @param int &$revid
 	 * @return bool
 	 */
 	public static function onSkinTemplateBuildNavUrlsNav_urlsAfterPermalink(
@@ -49,7 +49,7 @@ class CiteThisPageHooks {
 
 	/**
 	 * @param BaseTemplate $baseTemplate
-	 * @param array $toolbox
+	 * @param array &$toolbox
 	 * @return bool
 	 */
 	public static function onBaseTemplateToolbox( BaseTemplate $baseTemplate, array &$toolbox ) {
diff --git a/SpecialCiteThisPage.php b/SpecialCiteThisPage.php
index 819635bd..41455a6a 100644
--- a/SpecialCiteThisPage.php
+++ b/SpecialCiteThisPage.php
@@ -17,7 +17,7 @@ class SpecialCiteThisPage extends FormSpecialPage {
 	}
 
 	/**
-	 * @param $par string
+	 * @param string $par
 	 */
 	public function execute( $par ) {
 		$this->setHeaders();
diff --git a/phpcs.xml b/phpcs.xml
index 58772d61..38d53b75 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,9 +2,6 @@
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
@@ -12,6 +9,5 @@
 	</rule>
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc" />
-	<arg name="encoding" value="utf8" />
-	<exclude-pattern>vendor</exclude-pattern>
+	<arg name="encoding" value="UTF-8" />
 </ruleset>