diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index ff824ca8c..a1d43d0d6 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -226,8 +226,8 @@ static void removeModifiedVars(ProgramMemory& pm, const Token* tok, const Token*
 }
 
 static ProgramMemory getInitialProgramState(const Token* tok,
-                                            const Token* origin,
-                                            const std::unordered_map<nonneg int, ValueFlow::Value>& vars = std::unordered_map<nonneg int, ValueFlow::Value>{})
+        const Token* origin,
+        const std::unordered_map<nonneg int, ValueFlow::Value>& vars = std::unordered_map<nonneg int, ValueFlow::Value> {})
 {
     ProgramMemory pm;
     if (origin) {
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index acaf9f826..b77f4b5d2 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -1658,8 +1658,7 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
-    void nullpointer49()
-    {
+    void nullpointer49() {
         check("void f(int *p, int n) {\n"
               "    int *q = 0;\n"
               "    if(n > 10) q = p;\n"
@@ -1677,8 +1676,7 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
-    void nullpointer50()
-    {
+    void nullpointer50() {
         check("void f(int *p, int a) {\n"
               "    if(!p) {\n"
               "        if(a > 0) {\n"