diff --git a/.checkstyle.xml b/.checkstyle.xml
index eac59ec9..e95b0519 100644
--- a/.checkstyle.xml
+++ b/.checkstyle.xml
@@ -10,6 +10,11 @@
 
     <module name="SuppressWarningsFilter" />
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="SuppressWarningsHolder"/>
         <module name="OuterTypeFilename"/>
@@ -23,10 +28,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="TodoComment">
             <!-- Allow comments which have an issue number as they are accounted for in the issue tracker -->
             <property name="format" value="TODO(?! #\d+:)|FIXME"/>
@@ -150,6 +151,11 @@
         <module name="JavadocMethod">
             <property name="scope" value="package"/>
             <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler, Before, BeforeClass"/>
+            <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
+        </module>
+        <module name="MissingJavadocMethod">
+            <property name="scope" value="package"/>
             <property name="minLineCount" value="4"/>
             <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler, Before, BeforeClass"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
@@ -157,6 +163,11 @@
         <module name="JavadocMethod">
             <property name="scope" value="private"/>
             <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler"/>
+            <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
+        </module>
+        <module name="MissingJavadocMethod">
+            <property name="scope" value="private"/>
             <property name="minLineCount" value="16"/>
             <property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler"/>
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->