diff --git a/config/checkstyle_checks.xml b/config/checkstyle_checks.xml
index 478861502..1edc15958 100644
--- a/config/checkstyle_checks.xml
+++ b/config/checkstyle_checks.xml
@@ -254,6 +254,14 @@
     <module name="NoClone"/>
     <module name="NoFinalizer"/>
     <module name="NoLineWrap"/>
+    <module name="SeparatorWrap">
+      <property name="tokens" value="DOT"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="tokens" value="COMMA"/>
+      <property name="option" value="EOL"/>
+    </module>
     <module name="StringLiteralEquality"/>
     <module name="SuperClone"/>
     <module name="SuperFinalize"/>
@@ -295,7 +303,6 @@
     <module name="TrailingComment"/>
     <module name="RequireThis"/>
     <module name="ReturnCount"/>
-    <module name="SeparatorWrap"/>
     <module name="SingleLineJavadoc"/>
     <module name="SummaryJavadoc"/>
     <module name="ThrowsCount"/>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
index 7c4640e82..3a0645dc2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/Main.java
@@ -62,8 +62,8 @@ public final class Main
      * @throws CheckstyleException if there is a problem with parsing a property file
      * @throws FileNotFoundException if there is a problem with files access
      **/
-    public static void main(String... args) throws UnsupportedEncodingException
-            , CheckstyleException, FileNotFoundException
+    public static void main(String... args) throws UnsupportedEncodingException,
+            CheckstyleException, FileNotFoundException
     {
         int errorCounter = 0;
         boolean cliViolations = false;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
index d88ca772b..8570fab08 100755
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -327,8 +327,8 @@ public final class TreeWalker
      * @param contents the contents of the file the AST was generated from.
      * @param astState state of AST.
      */
-    private void walk(DetailAST ast, FileContents contents
-            , AstState astState)
+    private void walk(DetailAST ast, FileContents contents,
+            AstState astState)
     {
         notifyBegin(ast, contents, astState);
 
@@ -345,8 +345,8 @@ public final class TreeWalker
      * @param contents the contents of the file the AST was generated from.
      * @param astState state of AST.
      */
-    private void notifyBegin(DetailAST rootAST, FileContents contents
-            , AstState astState)
+    private void notifyBegin(DetailAST rootAST, FileContents contents,
+            AstState astState)
     {
         Set<Check> checks;
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
index f4cfe0ed5..6537ea2b0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/FinalParametersCheck.java
@@ -200,8 +200,8 @@ public class FinalParametersCheck extends Check
     {
         boolean result = false;
         if (ignorePrimitiveTypes) {
-            final DetailAST parameterType = paramDef.
-                    findFirstToken(TokenTypes.TYPE).getFirstChild();
+            final DetailAST parameterType = paramDef
+                .findFirstToken(TokenTypes.TYPE).getFirstChild();
             if (primitiveDataTypes.contains(parameterType.getType())) {
                 result = true;
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
index bf914eaa9..aa6041c14 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java
@@ -356,8 +356,8 @@ public final class AnnotationUseStyleCheck extends Check
                 valuePair.findFirstToken(TokenTypes.ANNOTATION_ARRAY_INIT);
 
             if (nestedArrayInit != null
-                && AnnotationUseStyleCheck.
-                    ANNOTATION_ELEMENT_SINGLE_NAME.equals(
+                && AnnotationUseStyleCheck
+                    .ANNOTATION_ELEMENT_SINGLE_NAME.equals(
                     valuePair.getFirstChild().getText())
                     && nestedArrayInit.getChildCount(TokenTypes.EXPR) == 1)
             {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
index 14b3bb3c6..68864e1f0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/MissingDeprecatedCheck.java
@@ -184,8 +184,8 @@ public final class MissingDeprecatedCheck extends Check
             final Matcher javadocNoargMatcher =
                 MissingDeprecatedCheck.MATCH_DEPRECATED.matcher(line);
             final Matcher noargMultilineStart =
-                MissingDeprecatedCheck.
-                    MATCH_DEPRECATED_MULTILINE_START.matcher(line);
+                MissingDeprecatedCheck
+                    .MATCH_DEPRECATED_MULTILINE_START.matcher(line);
 
             if (javadocNoargMatcher.find()) {
                 if (found) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
index d71ac5782..2953805e8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyCatchBlockCheck.java
@@ -256,8 +256,8 @@ public class EmptyCatchBlockCheck extends Check
     private boolean isVerifiable(DetailAST emptyCatchAst, String commentContent)
     {
         final String exceptionVariableName = getExceptionVariableName(emptyCatchAst);
-        final boolean isMatchingVariableName = variableNameRegexp.
-                matcher(exceptionVariableName).find();
+        final boolean isMatchingVariableName = variableNameRegexp
+                .matcher(exceptionVariableName).find();
         final boolean isMatchingCommentContent = !commentContent.isEmpty()
                  && commentRegexp.matcher(commentContent).find();
         return !isMatchingVariableName && !isMatchingCommentContent;
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
index 509fd328c..e494bead2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java
@@ -203,8 +203,8 @@ public final class IllegalTypeCheck extends AbstractFormatCheck
         boolean result = true;
         if (memberModifiers != null) {
             result = false;
-            final DetailAST modifiersAst = methodOrVariableDef.
-                    findFirstToken(TokenTypes.MODIFIERS);
+            final DetailAST modifiersAst = methodOrVariableDef
+                    .findFirstToken(TokenTypes.MODIFIERS);
             if (modifiersAst.getFirstChild() != null) {
                 for (DetailAST modifier = modifiersAst.getFirstChild(); modifier != null;
                          modifier = modifier.getNextSibling())
@@ -329,8 +329,8 @@ public final class IllegalTypeCheck extends AbstractFormatCheck
     private void extendIllegalClassNamesWithShortName(String canonicalName)
     {
         if (illegalClassNames.contains(canonicalName)) {
-            final String shortName = canonicalName.
-                substring(canonicalName.lastIndexOf('.') + 1);
+            final String shortName = canonicalName
+                .substring(canonicalName.lastIndexOf('.') + 1);
             illegalClassNames.add(shortName);
         }
     }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
index d352160e4..efa236e43 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java
@@ -370,8 +370,8 @@ public class VariableDeclarationUsageDistanceCheck extends Check
                     break;
 
                 case TokenTypes.VARIABLE_DEF:
-                    final String currentVariableName = currentSiblingAst.
-                        findFirstToken(TokenTypes.IDENT).getText();
+                    final String currentVariableName = currentSiblingAst
+                        .findFirstToken(TokenTypes.IDENT).getText();
                     isUsedVariableDeclarationFound = variableName.equals(currentVariableName);
                     break;
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
index 21945891b..30d3a9fc3 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/OneTopLevelClassCheck.java
@@ -130,8 +130,8 @@ public class OneTopLevelClassCheck extends Check
                     publicTypeFound = true;
                 }
                 else {
-                    final String typeName = currentNode.
-                            findFirstToken(TokenTypes.IDENT).getText();
+                    final String typeName = currentNode
+                            .findFirstToken(TokenTypes.IDENT).getText();
                     lineNumberTypeMap.put(currentNode.getLineNo(), typeName);
                 }
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
index 8ab2e2688..71008c6ad 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java
@@ -649,8 +649,8 @@ public class CustomImportOrderCheck extends Check
      */
     private static String getFullImportIdent(DetailAST token)
     {
-        return token != null ? FullIdent.createFullIdent(token.
-                findFirstToken(TokenTypes.DOT)).getText() : "";
+        return token != null ? FullIdent.createFullIdent(token
+                .findFirstToken(TokenTypes.DOT)).getText() : "";
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
index 181f30a8a..e2e34d8a0 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/SwitchHandler.java
@@ -77,8 +77,7 @@ public class SwitchHandler extends BlockParentHandler
     private void checkSwitchExpr()
     {
         checkExpressionSubtree(
-            getMainAst().findFirstToken(TokenTypes.LPAREN).
-                getNextSibling(),
+            getMainAst().findFirstToken(TokenTypes.LPAREN).getNextSibling(),
             getLevel(),
             false,
             false);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
index 7a9208c6b..fb34d4065 100755
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
@@ -288,8 +288,8 @@ public abstract class AbstractJavadocCheck extends Check
         JavadocNodeImpl[] children = new JavadocNodeImpl[childCount];
 
         for (int i = 0; i < childCount; i++) {
-            final JavadocNodeImpl child = createJavadocNode(parseTreeNode.getChild(i)
-                    , rootJavadocNode, i);
+            final JavadocNodeImpl child = createJavadocNode(parseTreeNode.getChild(i),
+                    rootJavadocNode, i);
             children[i] = child;
         }
         rootJavadocNode.setChildren(children);
@@ -310,8 +310,8 @@ public abstract class AbstractJavadocCheck extends Check
 
                 for (int j = 0; j < subChildren.length; j++) {
                     final JavadocNodeImpl child =
-                            createJavadocNode(currentParseTreeNodeChild.getChild(j)
-                                    , currentJavadocNode, j);
+                            createJavadocNode(currentParseTreeNodeChild.getChild(j),
+                                    currentJavadocNode, j);
 
                     subChildren[j] = child;
                 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocUtils.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocUtils.java
index 9b8902aea..eaa75293d 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocUtils.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocUtils.java
@@ -80,8 +80,8 @@ public final class JavadocUtils
                 }
             }
             catch (Exception e) {
-                throw new IllegalStateException("Failed to instantiate collection of Javadoc tokens"
-                        , e);
+                throw new IllegalStateException(
+                    "Failed to instantiate collection of Javadoc tokens", e);
             }
         }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
index 0af732572..a6469e44a 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/MainTest.java
@@ -131,8 +131,8 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/main/resources/non_existing_config.xml"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/main/resources/non_existing_config.xml",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -145,13 +145,13 @@ public class MainTest
             public void checkAssertion()
             {
                 assertEquals("Invalid output format."
-                        + " Found '" + "xmlp" + "' but expected 'plain' or 'xml'.\n"
-                        , standardLog.getLog());
+                        + " Found '" + "xmlp" + "' but expected 'plain' or 'xml'.\n",
+                        standardLog.getLog());
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "/google_checks.xml", "-f" , "xmlp"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "/google_checks.xml", "-f" , "xmlp",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -168,8 +168,8 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -195,9 +195,9 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml"
-                , "-f", "xml"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml",
+                "-f", "xml",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -214,9 +214,9 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml"
-                , "-f", "plain"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml",
+                "-f", "plain",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -236,13 +236,13 @@ public class MainTest
                     + currentPath
                     + "/src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java:5:7: "
                     + "warning: Name 'InputMainInner' must match pattern '^[a-z0-9]*$'.\n"
-                    + "Audit done.\n"
-                    , standardLog.getLog());
+                    + "Audit done.\n",
+                    standardLog.getLog());
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname2.xml"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname2.xml",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -267,9 +267,9 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname2-error.xml"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname2-error.xml",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -285,10 +285,10 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml"
-                , "-f", "plain"
-                , "-o", "myjava.java"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml",
+                "-f", "plain",
+                "-o", "myjava.java",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -308,10 +308,10 @@ public class MainTest
                 assertEquals("", errorLog.getLog());
             }
         });
-        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml"
-                , "-f", "plain"
-                , "-o", file.getCanonicalPath()
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+        Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/config-classname.xml",
+                "-f", "plain",
+                "-o", file.getCanonicalPath(),
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -329,9 +329,9 @@ public class MainTest
             }
         });
         Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/"
-                + "config-classname-prop.xml"
-                , "-p", "src/test/resources/com/puppycrawl/tools/checkstyle/mycheckstyle.properties"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+                + "config-classname-prop.xml",
+                "-p", "src/test/resources/com/puppycrawl/tools/checkstyle/mycheckstyle.properties",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 
     @Test
@@ -348,8 +348,8 @@ public class MainTest
             }
         });
         Main.main("-c", "src/test/resources/com/puppycrawl/tools/checkstyle/"
-                + "config-classname-prop.xml"
-                , "-p", "nonexisting.properties"
-                , "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
+                + "config-classname-prop.xml",
+                "-p", "nonexisting.properties",
+                "src/test/resources/com/puppycrawl/tools/checkstyle/InputMain.java");
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
index 58b035312..bde1c714d 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheckTest.java
@@ -136,7 +136,7 @@ public class FinalLocalVariableCheckTest
         checkConfig.addAttribute("tokens", "PARAMETER_DEF,VARIABLE_DEF");
         final String[] expected = {};
         verify(checkConfig, new File("src/test/resources-noncompilable/com/puppycrawl/"
-                + "tools/checkstyle/naming/InputFinalLocalVariableNameLambda.java").
-                getCanonicalPath(), expected);
+                + "tools/checkstyle/naming/InputFinalLocalVariableNameLambda.java")
+                .getCanonicalPath(), expected);
     }
 }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
index 6e9d06ed3..bec861bbc 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheckTest.java
@@ -27,8 +27,7 @@ import org.junit.Test;
 import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_ASSIGN;
 import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_EXPR;
 import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_IDENT;
-import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.
-MSG_LITERAL;
+import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_LITERAL;
 import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_RETURN;
 import static com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck.MSG_STRING;
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
index 3e340a706..bfa9c1885 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
@@ -24,10 +24,8 @@ import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 
-import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.
-WS_NOT_FOLLOWED;
-import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.
-WS_NOT_PRECEDED;
+import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.WS_NOT_FOLLOWED;
+import static com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck.WS_NOT_PRECEDED;
 
 public class WhitespaceAroundTest
     extends BaseCheckTestSupport