diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 5a06b054..9166b05b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -14,14 +14,16 @@
 		<!-- Do not enforce 'class-' prefix -->
 		<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
 
-		<!-- Allow short ternaries -->
-		<exclude name="WordPress.PHP.DisallowShortTernary.Found" />
-
+		<!-- These are for legacy reasons, as EditFlow's main file cannot be altered -->
 		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
 		<exclude name="Universal.Files.SeparateFunctionsFromOO.Mixed" />
 		<exclude name="PEAR.NamingConventions.ValidClassName.StartWithCapital" />
 		<exclude name="PEAR.NamingConventions.ValidClassName.Invalid" />
 
+		<!-- Allow short ternaries -->
+		<exclude name="WordPress.PHP.DisallowShortTernary.Found" />
+
+		<!-- Allow not returning after the setup theme filter for now -->
 		<exclude name="WordPressVIPMinimum.Hooks.AlwaysReturnInFilter.MissingReturnStatement" />
 
 		<!-- Generates too many false positives -->
@@ -29,11 +31,13 @@
 		<!-- We use trigger_error extensively -->
 		<exclude name="WordPress.PHP.DevelopmentFunctions.error_log_trigger_error" />
 
+		<!-- Localization is done in a legacy manner in some places, and its ben left as is for now -->
 		<exclude name="WordPress.WP.I18n.InterpolatedVariableSingular" />
 		<exclude name="WordPress.WP.I18n.InterpolatedVariablePlural" />
 		<exclude name="WordPress.WP.I18n.MissingSingularPlaceholder" />
 		<exclude name="WordPress.WP.I18n.NonSingularStringLiteralText" />
 
+		<!-- This rule is hard to solve given the heavy use of JS in the PHP code right now -->
 		<exclude name="Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure" />
 	</rule>