diff --git a/checkstyle.xml b/checkstyle.xml
index 2306edfa3..5ffbf11c8 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -5,15 +5,27 @@
 
 <module name="Checker">
 	<module name="TreeWalker">
+		<module name="AnnotationUseStyle"/>
+		<module name="ArrayTypeStyle"/>
+		<module name="AvoidNestedBlocks">
+			<property name="allowInSwitchCase" value="true"/>
+		</module>
 		<module name="AvoidStarImport"/>
+		<module name="BooleanExpressionComplexity">
+			<property name="max" value="8"/>
+		</module>
+		<module name="ClassTypeParameterName"/>
+		<module name="ConstantName"/>
+		<module name="CovariantEquals"/>
+		<module name="CyclomaticComplexity"/>
+		<module name="DeclarationOrder"/>
+		<module name="DefaultComesLast"/>
+		
 		<module name="LineLength">
 			<property name="max" value="250"/>
 		</module>
 		<module name="RedundantImport"/>
 		<module name="TodoComment"/>
-		<module name="TodoComment">
-			<property name="format" value="FIXME"/>
-		</module>
 		<module name="UnusedImports"/>
 	</module>
 </module>
\ No newline at end of file