diff --git a/config/checkstyle_sevntu_checks.xml b/config/checkstyle_sevntu_checks.xml
index 08df6035b..d24a831ab 100644
--- a/config/checkstyle_sevntu_checks.xml
+++ b/config/checkstyle_sevntu_checks.xml
@@ -52,5 +52,8 @@
             <property name="targetConstantTypes" value="LITERAL_NULL,LITERAL_TRUE,LITERAL_FALSE,NUM_INT,NUM_DOUBLE,NUM_LONG,NUM_FLOAT"/>
         </module>
         <module name="EitherLogOrThrowCheck"/>
+        <module name="SingleSpaceSeparator">
+            <metadata name="validateCommentNodes" value="false"/>
+        </module>
     </module>
 </module>
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
index 01879e97e..2c46115f2 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
@@ -197,7 +197,7 @@ public abstract class AbstractTypeAwareCheck extends Check {
      */
     protected static boolean isSubclass(Class<?> child, Class<?> parent) {
         return parent != null && child != null
-            &&  parent.isAssignableFrom(child);
+            && parent.isAssignableFrom(child);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
index fff37eb5f..01fb1f45b 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TranslationCheck.java
@@ -255,7 +255,7 @@ public class TranslationCheck
         boolean missing = false;
         for (File file : filesInResourceBundle) {
             final String currentFileName = file.getPath();
-            missing =  !currentFileName.equals(fileName);
+            missing = !currentFileName.equals(fileName);
             if (!missing) {
                 break;
             }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
index d5f62075b..02332c098 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java
@@ -140,7 +140,7 @@ public final class MutableExceptionCheck extends Check {
                 ast.findFirstToken(TokenTypes.MODIFIERS);
 
             if (modifiersAST.findFirstToken(TokenTypes.FINAL) == null) {
-                log(ast.getLineNo(),  ast.getColumnNo(), MSG_KEY,
+                log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
                         ast.findFirstToken(TokenTypes.IDENT).getText());
             }
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
index 06e6e2816..35a484be8 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java
@@ -129,7 +129,7 @@ public final class ThrowsCountCheck extends Check {
             // Account for all the commas!
             final int count = (ast.getChildCount() + 1) / 2;
             if (count > max) {
-                log(ast.getLineNo(),  ast.getColumnNo(), MSG_KEY,
+                log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
                     count, max);
             }
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
index 87bb0e3c8..a9ef8a488 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/CommentsIndentationCheck.java
@@ -234,7 +234,7 @@ public class CommentsIndentationCheck extends Check {
                 destributed = true;
             }
         }
-        return  destributed;
+        return destributed;
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
index 4b7f97f40..a0bf70162 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java
@@ -84,7 +84,7 @@ public class ConstantNameCheck
         final boolean isStatic = modifiersAST.branchContains(TokenTypes.LITERAL_STATIC);
         final boolean isFinal = modifiersAST.branchContains(TokenTypes.FINAL);
 
-        if (isStatic  && isFinal && shouldCheckInScope(modifiersAST)
+        if (isStatic && isFinal && shouldCheckInScope(modifiersAST)
                 || ScopeUtils.isInAnnotationBlock(ast)
                 || ScopeUtils.isInInterfaceOrAnnotationBlock(ast)
                         && !ScopeUtils.isInCodeBlock(ast)) {