diff --git a/dumux/multidomain/newtoncontroller.hh b/dumux/multidomain/newtoncontroller.hh
index 5a36bfc45ec143b5979a1fc34c2d89a76a875bb6..54837e4c6215596f607495bab348f39bca1982e9 100644
--- a/dumux/multidomain/newtoncontroller.hh
+++ b/dumux/multidomain/newtoncontroller.hh
@@ -68,7 +68,6 @@ class MultiDomainNewtonController : public NewtonController<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
     typedef typename GET_PROP_TYPE(TypeTag, SplitAndMerge) SplitAndMerge;
     typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-    typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
 
     typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
@@ -76,7 +75,7 @@ class MultiDomainNewtonController : public NewtonController<TypeTag>
     typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridView) GridView1;
     typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridView) GridView2;
 
-    typedef MultiDomainConvergenceWriter<TypeTag>  ConvergenceWriter;
+    typedef MultiDomainConvergenceWriter<TypeTag> ConvergenceWriter;
     typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
 
 public:
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index a72471cad8511ac638ddbc0da6cd9c0e47511e1d..dbeb48187fe6e9483dc77679193c73555eba2c5b 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -495,8 +495,8 @@ public:
         }
         endIterMsgStream_.str("");
 
-//         When the newton iterations is done: ask the model to check whether it makes sense.
-        model_().checkPlausibility() ;
+        // When the Newton iterations are done: ask the model to check whether it makes sense
+        model_().checkPlausibility();
     }
 
     /*!
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 34aa67a6ec5c2a4eae50c6ad9e6944275a8e0cf3..391543ea9faabd4601f9b83ba1d96c45de2b2aa0 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -475,7 +475,8 @@ public:
     {
         bool wasSwitched = false;
         int succeeded;
-        try {
+        try
+        {
             for (unsigned i = 0; i < staticDat_.size(); ++i)
                 staticDat_[i].visited = false;
 
@@ -488,24 +489,24 @@ public:
                 {
                     int dofIdxGlobal = this->dofMapper().subIndex(element, scvIdx, dofCodim);
 
-                    if (staticDat_[dofIdxGlobal].visited)
-                        continue;
-
-                    staticDat_[dofIdxGlobal].visited = true;
-                    volVars.update(curGlobalSol[dofIdxGlobal],
-                            this->problem_(),
-                            element,
-                            fvGeometry,
-                            scvIdx,
-                            false);
-                    const GlobalPosition &globalPos = fvGeometry.subContVol[scvIdx].global;
-                    if (primaryVarSwitch_(curGlobalSol,
-                            volVars,
-                            dofIdxGlobal,
-                            globalPos))
+                    if (!staticDat_[dofIdxGlobal].visited)
                     {
-                        this->jacobianAssembler().markDofRed(dofIdxGlobal);
-                        wasSwitched = true;
+                        staticDat_[dofIdxGlobal].visited = true;
+                        volVars.update(curGlobalSol[dofIdxGlobal],
+                                      this->problem_(),
+                                      element,
+                                      fvGeometry,
+                                      scvIdx,
+                                      false);
+                        const GlobalPosition &globalPos = fvGeometry.subContVol[scvIdx].global;
+                        if (primaryVarSwitch_(curGlobalSol,
+                                              volVars,
+                                              dofIdxGlobal,
+                                              globalPos))
+                        {
+                            this->jacobianAssembler().markDofRed(dofIdxGlobal);
+                            wasSwitched = true;
+                        }
                     }
                 }
             }
@@ -523,10 +524,10 @@ public:
         if (this->gridView_().comm().size() > 1)
             succeeded = this->gridView_().comm().min(succeeded);
 
-        if (!succeeded) {
-                DUNE_THROW(NumericalProblem,
-                        "A process did not succeed in updating the static data.");
-            return;
+        if (!succeeded)
+        {
+            DUNE_THROW(NumericalProblem,
+                       "A process did not succeed in updating the static data.");
         }
 
         // make sure that if there was a variable switch in an