diff --git a/.phpcs.xml b/.phpcs.xml
index 65cfa12..9ac1ae8 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -10,23 +10,23 @@
     <arg name="colors"/>
     <arg name="parallel" value="75"/>
 
-    <rule ref="PSR1"/>
-    <rule ref="PSR2"/>
-    <rule ref="PSR12"/>
+    <rule ref="PSR1">
+        <type>error</type>
+    </rule>
+
+    <rule ref="PSR2">
+        <type>error</type>
+    </rule>
+
+    <rule ref="PSR12">
+        <type>error</type>
+    </rule>
 
     <!-- Don't hide tokenizer exceptions -->
     <rule ref="Internal.Tokenizer.Exception">
         <type>error</type>
     </rule>
 
-    <!-- Have 12 chars padding maximum and always show as errors -->
-    <rule ref="Generic.Formatting.MultipleStatementAlignment">
-        <properties>
-            <property name="maxPadding" value="12"/>
-            <property name="error" value="true"/>
-        </properties>
-    </rule>
-
     <!-- Ban some functions -->
     <rule ref="Generic.PHP.ForbiddenFunctions">
         <properties>
@@ -36,17 +36,8 @@
                 <element key="print" value="echo"/>
                 <element key="is_null" value="null"/>
                 <element key="create_function" value="null"/>
+                <element key="assert" value="Psl\invariant"/>
             </property>
         </properties>
     </rule>
-
-    <!-- Private methods MUST not be prefixed with an underscore -->
-    <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
-        <type>error</type>
-    </rule>
-
-    <!-- Private properties MUST not be prefixed with an underscore -->
-    <rule ref="PSR2.Classes.PropertyDeclaration.Underscore">
-        <type>error</type>
-    </rule>
 </ruleset>