diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index 7244b65c3..fc372cdc1 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -60,5 +60,6 @@
         </module>
         <module name="AvoidNotShortCircuitOperatorsForBoolean"/>
         <module name="RedundantReturn"/>
+        <module name="WhitespaceBeforeArrayInitializer"/>
     </module>
 </module>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
index 89c3660ce..b8682b9c8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java
@@ -46,7 +46,7 @@ public class AvoidInlineConditionalsCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.QUESTION};
+        return new int[] {TokenTypes.QUESTION};
     }
 
     @Override
@@ -56,7 +56,7 @@ public class AvoidInlineConditionalsCheck extends Check {
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{TokenTypes.QUESTION};
+        return new int[] {TokenTypes.QUESTION};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
index 79ac05674..b1d6e2bae 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java
@@ -92,7 +92,7 @@ public class FallThroughCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.CASE_GROUP};
+        return new int[] {TokenTypes.CASE_GROUP};
     }
 
     @Override
@@ -102,7 +102,7 @@ public class FallThroughCheck extends Check {
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{TokenTypes.CASE_GROUP};
+        return new int[] {TokenTypes.CASE_GROUP};
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
index 81d038364..a9d81c813 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java
@@ -47,7 +47,7 @@ public class MissingCtorCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.CLASS_DEF};
+        return new int[] {TokenTypes.CLASS_DEF};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
index 2f41a1bfa..0aba4eea4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java
@@ -54,7 +54,7 @@ public class MissingSwitchDefaultCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.LITERAL_SWITCH};
+        return new int[] {TokenTypes.LITERAL_SWITCH};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
index 7ee458aa8..d613fefff 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
@@ -94,7 +94,7 @@ public final class OneStatementPerLineCheck extends Check {
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{
+        return new int[] {
             TokenTypes.SEMI, TokenTypes.FOR_INIT,
             TokenTypes.FOR_ITERATOR,
         };
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
index 9e65e14c4..f4501750d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java
@@ -72,9 +72,7 @@ public final class ReturnCountCheck extends Check {
 
     @Override
     public int[] getRequiredTokens() {
-        return new int[]{
-            TokenTypes.LITERAL_RETURN,
-        };
+        return new int[] {TokenTypes.LITERAL_RETURN};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
index 682600411..d9b6341e5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java
@@ -60,7 +60,7 @@ public class FinalClassCheck
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{TokenTypes.CLASS_DEF, TokenTypes.CTOR_DEF};
+        return new int[] {TokenTypes.CLASS_DEF, TokenTypes.CTOR_DEF};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
index 05c9e32c2..e908450d0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java
@@ -81,7 +81,7 @@ public class JavaNCSSCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{
+        return new int[] {
             TokenTypes.CLASS_DEF,
             TokenTypes.INTERFACE_DEF,
             TokenTypes.METHOD_DEF,
@@ -115,7 +115,7 @@ public class JavaNCSSCheck extends Check {
 
     @Override
     public int[] getRequiredTokens() {
-        return new int[]{
+        return new int[] {
             TokenTypes.CLASS_DEF,
             TokenTypes.INTERFACE_DEF,
             TokenTypes.METHOD_DEF,
@@ -149,7 +149,7 @@ public class JavaNCSSCheck extends Check {
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{
+        return new int[] {
             TokenTypes.CLASS_DEF,
             TokenTypes.INTERFACE_DEF,
             TokenTypes.METHOD_DEF,
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
index d8b186f52..c74b06d55 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java
@@ -96,17 +96,17 @@ public final class AbstractClassNameCheck extends Check {
 
     @Override
     public int[] getDefaultTokens() {
-        return new int[]{TokenTypes.CLASS_DEF};
+        return new int[] {TokenTypes.CLASS_DEF};
     }
 
     @Override
     public int[] getRequiredTokens() {
-        return new int[]{TokenTypes.CLASS_DEF};
+        return new int[] {TokenTypes.CLASS_DEF};
     }
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{TokenTypes.CLASS_DEF};
+        return new int[] {TokenTypes.CLASS_DEF};
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
index 5a572b34a..3d7f53b46 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
@@ -76,7 +76,7 @@ public class CatchParameterNameCheck extends AbstractNameCheck {
 
     @Override
     public int[] getAcceptableTokens() {
-        return new int[]{TokenTypes.PARAMETER_DEF};
+        return new int[] {TokenTypes.PARAMETER_DEF};
     }
 
     @Override