diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index f5684a4a68..fc4351037b 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -195,7 +195,8 @@ Foam::dimensionedScalar Foam::multiphaseSystem::sigma
     {
         FatalErrorIn
         (
-            "multiphaseSystem::sigma(const phaseModel& phase1, const phaseModel& phase2) const"
+            "multiphaseSystem::sigma(const phaseModel& phase1,"
+            "const phaseModel& phase2) const"
         )   << "Cannot find interface " << interfacePair(phase1, phase2)
             << " in list of sigma values"
             << exit(FatalError);
@@ -220,7 +221,8 @@ Foam::scalar Foam::multiphaseSystem::cAlpha
     {
         FatalErrorIn
         (
-            "multiphaseSystem::cAlpha(const phaseModel& phase1, const phaseModel& phase2) const"
+            "multiphaseSystem::cAlpha"
+            "(const phaseModel& phase1, const phaseModel& phase2) const"
         )   << "Cannot find interface " << interfacePair(phase1, phase2)
             << " in list of cAlpha values"
             << exit(FatalError);
@@ -255,7 +257,8 @@ Foam::dimensionedScalar Foam::multiphaseSystem::Cvm
 
     FatalErrorIn
     (
-        "multiphaseSystem::sigma(const phaseModel& phase1, const phaseModel& phase2) const"
+        "multiphaseSystem::sigma"
+        "(const phaseModel& phase1, const phaseModel& phase2) const"
     )   << "Cannot find interface " << interfacePair(phase1, phase2)
         << " in list of sigma values"
         << exit(FatalError);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
index 9d6afa593e..5f7c38ebf0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@@ -199,7 +199,8 @@
                 for
                 (
                     ;
-                    dmIter != fluid.dragModels().end() && dcIter != dragCoeffs().end();
+                    dmIter != fluid.dragModels().end()
+                 && dcIter != dragCoeffs().end();
                     ++dmIter, ++dcIter
                 )
                 {
@@ -210,7 +211,12 @@
                     )
                     {
                         int phasej = 0;
-                        forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter2)
+                        forAllIter
+                        (
+                            PtrDictionary<phaseModel>,
+                            fluid.phases(),
+                            iter2
+                        )
                         {
                             phaseModel& phase2 = iter2();