diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml
index 92124d1..038a82b 100644
--- a/src/main/resources/checkstyle.xml
+++ b/src/main/resources/checkstyle.xml
@@ -6,10 +6,20 @@
 -->
 <!--
     Checkstyle-Configuration: Google Checks PR
-    Description: none
+    Description:     Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.org (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+    To suppress certain violations please review suppression filters.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+
 -->
 <module name="Checker">
-  <property name="severity" value="warning"/>
+  <property name="severity" value="error"/>
   <property name="charset" value="UTF-8"/>
   <property name="fileExtensions" value="java, properties, xml"/>
   <module name="TreeWalker">
@@ -162,10 +172,12 @@
       <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace."/>
     </module>
     <module name="Indentation">
-      <property name="arrayInitIndent" value="2"/>
       <property name="basicOffset" value="2"/>
       <property name="braceAdjustment" value="2"/>
       <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="4"/>
+      <property name="lineWrappingIndentation" value="4"/>
+      <property name="arrayInitIndent" value="2"/>
     </module>
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false"/>
diff --git a/src/main/resources/suppressions.xml b/src/main/resources/suppressions.xml
index 0f082bf..444d0b8 100644
--- a/src/main/resources/suppressions.xml
+++ b/src/main/resources/suppressions.xml
@@ -5,14 +5,6 @@
         "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-    <suppress checks="AvoidStarImport|VisibilityModifier|Javadoc.*" files="test.*\.java"/>
-    <suppress checks="JavadocType|JavadocMethod" files="example.*\.java"/>
-    <suppress checks="ImportOrder"
-              files="test.*\.java"/>
-    <suppress checks=".*" files=".*\.rtf$"/>
-    <suppress checks="Javadoc.*$" files="intTest.*\.java"/>
-    <suppress checks="AbbreviationAsWordInName" files="CorbadoSDK.*\.java"/>
 	<suppress checks=".*" files="com[\\/]corbado[\\/]generated[\\/]"/>
-	<suppress files=".+\.(?:java|gif|jpg|jpeg)$" checks=".*"/>
 
 </suppressions>
\ No newline at end of file