diff --git a/lib/astutils.cpp b/lib/astutils.cpp
index c56362e6a..f6e6bc6a7 100644
--- a/lib/astutils.cpp
+++ b/lib/astutils.cpp
@@ -397,8 +397,8 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
             (!isNot && ((comp1 == "<" && comp2 == ">") ||
                         (comp1 == ">" && comp2 == "<") ||
                         (comp1 == "==" && (comp2 == "!=" || comp2 == ">" || comp2 == "<")) ||
-                        ((comp1 == "!=" || comp1 == ">" || comp1 == "<") && comp2 == "==") 
-            )));
+                        ((comp1 == "!=" || comp1 == ">" || comp1 == "<") && comp2 == "==")
+                       )));
 }
 
 bool isOppositeExpression(bool cpp, const Token * const tok1, const Token * const tok2, const Library& library, bool pure)
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 9f96c3656..72b055c9c 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -863,19 +863,19 @@ static std::string conditionString(bool not1, const Token *expr1, const std::str
 
 static std::string conditionString(const Token * tok)
 {
-    if(!tok)
+    if (!tok)
         return "";
-    if(tok->isComparisonOp()) {
+    if (tok->isComparisonOp()) {
         bool inconclusive = false;
         bool not_;
         std::string op, value;
         const Token *expr;
-        if(parseComparison(tok, &not_, &op, &value, &expr, &inconclusive) && expr->isName()) {
+        if (parseComparison(tok, &not_, &op, &value, &expr, &inconclusive) && expr->isName()) {
             return conditionString(not_, expr, op, value);
         }
     }
-    if(Token::Match(tok, "%cop%|&&|%oror%")) {
-        if(tok->astOperand2())
+    if (Token::Match(tok, "%cop%|&&|%oror%")) {
+        if (tok->astOperand2())
             return conditionString(tok->astOperand1()) + " " + tok->str() + " " + conditionString(tok->astOperand2());
         return tok->str() + "(" + conditionString(tok->astOperand1()) + ")";
 
@@ -964,7 +964,7 @@ void CheckCondition::checkIncorrectLogicOperator()
 
             if (inconclusive && !printInconclusive)
                 continue;
-            
+
             const bool isfloat = astIsFloat(expr1, true) || MathLib::isFloat(value1) || astIsFloat(expr2, true) || MathLib::isFloat(value2);
 
             // Opposite comparisons around || or && => always true or always false
@@ -974,8 +974,8 @@ void CheckCondition::checkIncorrectLogicOperator()
                 incorrectLogicOperatorError(tok, conditionString(tok), alwaysTrue, inconclusive);
                 continue;
             }
-            
-            if(!parseable)
+
+            if (!parseable)
                 continue;
 
             if (isSameExpression(mTokenizer->isCPP(), true, comp1, comp2, mSettings->library, true))
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index b7b7b6957..a251c8769 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -1222,13 +1222,13 @@ private:
     void incorrectLogicOperator11() {
         check("void foo(int i, const int n) { if ( i < n && i == n ) {} }");
         ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i < n && i == n.\n", errout.str());
-        
+
         check("void foo(int i, const int n) { if ( i > n && i == n ) {} }");
         ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i > n && i == n.\n", errout.str());
-        
+
         check("void foo(int i, const int n) { if ( i == n && i > n ) {} }");
         ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i == n && i > n.\n", errout.str());
-        
+
         check("void foo(int i, const int n) { if ( i == n && i < n ) {} }");
         ASSERT_EQUALS("[test.cpp:1]: (warning) Logical conjunction always evaluates to false: i == n && i < n.\n", errout.str());
     }