diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index e36cf2e..b068eab 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -13,6 +13,9 @@
   <module name="TreeWalker">
     <module name="Indentation">
       <property name="basicOffset" value="2"/>
+      <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="2"/>
+      <property name="lineWrappingIndentation" value="2"/>
     </module>
   </module>
 </module>
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index c1d43b6..0755c89 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -5,11 +5,4 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-  <suppress files="brouter-codec/.*" checks=".*"/>
-  <suppress files="brouter-core/.*" checks=".*"/>
-  <suppress files="brouter-expressions/.*" checks=".*"/>
-  <suppress files="brouter-map-creator/.*" checks=".*"/>
-  <suppress files="brouter-mapaccess/.*" checks=".*"/>
-  <suppress files="brouter-server/.*" checks=".*"/>
-  <suppress files="brouter-util/.*" checks=".*"/>
 </suppressions>