diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H
index 04d6f7ce71..245691029b 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H
@@ -94,7 +94,6 @@ SourceFiles
 
 #include "InterfaceCompositionModel.H"
 
-
 // * * * * * * * * * * * * * * * * *  * * * * * * * * * * * * * * * * * * * *//
 
 namespace Foam
@@ -103,7 +102,7 @@ namespace meltingEvaporationModels
 {
 
 /*---------------------------------------------------------------------------*\
-                                  Class Lee
+                             Class Lee Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Thermo, class OtherThermo>
@@ -111,7 +110,7 @@ class Lee
 :
     public InterfaceCompositionModel<Thermo, OtherThermo>
 {
-    // Private data
+    // Private Data
 
         //- Condensation coefficient [1/s]
         dimensionedScalar C_;
@@ -168,10 +167,9 @@ public:
         //- Return T transition between phases
         virtual const dimensionedScalar& Tactivate() const;
 
-        //- Adds and substract alpha*div(U) as a source term
-        //  for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
+        //- Add/subtract alpha*div(U) as a source term
+        //- for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
         virtual bool includeDivU();
-
 };
 
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C
index 3f84cf11ce..fb2806f2ab 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C
@@ -65,7 +65,7 @@ Foam::interfaceCompositionModel::interfaceCompositionModel
             modelVariable::T
         )
     ),
-    includeVolChange_(dict.lookupOrDefault<bool>("includeVolChange", true)),
+    includeVolChange_(dict.lookupOrDefault("includeVolChange", true)),
     pair_(pair),
     speciesName_(dict.lookupOrDefault<word>("species", "none")),
     mesh_(pair_.from().mesh())
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H
index 9962a95add..2d2ea9de51 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H
@@ -39,16 +39,17 @@ SourceFiles
 #ifndef interfaceCompositionModel_H
 #define interfaceCompositionModel_H
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #include "volFields.H"
 #include "dictionary.H"
 #include "runTimeSelectionTables.H"
 #include "Enum.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
 
+// Forward Declarations
 class phaseModel;
 class phasePair;
 
@@ -82,7 +83,7 @@ public:
 
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Phase pair
         const phasePair& pair_;
@@ -197,8 +198,8 @@ public:
         //- Reference value
         virtual const dimensionedScalar& Tactivate() const = 0;
 
-        //- Adds and substract alpha*div(U) as a source term
-        //  for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
+        //- Add/subtract alpha*div(U) as a source term
+        //- for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
         virtual bool includeDivU();
 
         //- Add volume change in pEq
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C
index 797d71ceef..bf7bc315f7 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C
@@ -195,23 +195,20 @@ Foam::meltingEvaporationModels::interfaceHeatResistance<Thermo, OtherThermo>
 
     updateInterface(T);
 
-    tmp<volScalarField> tdeltaT
+    auto tdeltaT = tmp<volScalarField>::New
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "tdeltaT",
-                mesh.time().timeName(),
-                mesh
-            ),
-            mesh,
-            dimensionedScalar(dimTemperature, Zero)
-        )
+            "tdeltaT",
+            mesh.time().timeName(),
+            mesh
+        ),
+        mesh,
+        dimensionedScalar(dimTemperature, Zero)
     );
-    volScalarField& deltaT = tdeltaT.ref();
+    auto& deltaT = tdeltaT.ref();
 
-    dimensionedScalar T0("T0", dimTemperature, Zero);
+    const dimensionedScalar T0(dimTemperature, Zero);
 
     if (sign(R_.value()) > 0)
     {
@@ -257,7 +254,7 @@ Foam::meltingEvaporationModels::interfaceHeatResistance<Thermo, OtherThermo>
 
     mDotc_ = interfaceArea_*htc_*deltaT;
 
-    return tmp<volScalarField>(new volScalarField(mDotc_));
+    return tmp<volScalarField>::New(mDotc_);
 }
 
 
@@ -283,10 +280,8 @@ Foam::meltingEvaporationModels::interfaceHeatResistance<Thermo, OtherThermo>
             return(coeff*pos(Tactivate_ - refValue));
         }
     }
-    else
-    {
-        return tmp<volScalarField> ();
-    }
+
+    return nullptr;
 }
 
 
@@ -314,12 +309,10 @@ Foam::meltingEvaporationModels::interfaceHeatResistance<Thermo, OtherThermo>
     }
     else if (interfaceCompositionModel::P == variable)
     {
-        return tmp<volScalarField>(new volScalarField(mDotcSpread_));
-    }
-    else
-    {
-        return tmp<volScalarField> ();
+        return tmp<volScalarField>::New(mDotcSpread_);
     }
+
+    return nullptr;
 }
 
 
@@ -340,4 +333,5 @@ interfaceHeatResistance<Thermo, OtherThermo>::includeDivU()
     return true;
 }
 
+
 // ************************************************************************* //
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H
index 3c49e72510..9b842db2c8 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H
@@ -74,7 +74,6 @@ SourceFiles
 #ifndef meltingEvaporationModels_interfaceHeatResistance_H
 #define meltingEvaporationModels_interfaceHeatResistance_H
 
-
 #include "InterfaceCompositionModel.H"
 
 // * * * * * * * * * * * * * * * * *  * * * * * * * * * * * * * * * * * * * *//
@@ -82,13 +81,14 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 namespace meltingEvaporationModels
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class interfaceHeatResistance
+                   Class interfaceHeatResistance Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Thermo, class OtherThermo>
@@ -96,7 +96,7 @@ class interfaceHeatResistance
 :
     public InterfaceCompositionModel<Thermo, OtherThermo>
 {
-    // Private data
+    // Private Data
 
         //- Heat transfer coefficient [1/s/K]
         dimensionedScalar R_;
@@ -123,7 +123,7 @@ class interfaceHeatResistance
         scalar spread_;
 
 
-    // Private member
+    // Private Member Functions
 
         //- Update interface
         void updateInterface(const volScalarField& T);
@@ -173,8 +173,8 @@ public:
         //- Return Tactivate
         virtual const dimensionedScalar& Tactivate() const;
 
-        //- Adds and substract alpha*div(U) as a source term
-        //  for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
+        //- Add/subtract alpha*div(U) as a source term
+        //- for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
         virtual bool includeDivU();
 };
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C
index 814fa9d862..aa8af7f4e7 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C
@@ -63,13 +63,10 @@ void Foam::meltingEvaporationModels::kineticGasEvaporation<Thermo, OtherThermo>
         }
     }
 
-    const polyBoundaryMesh& pbm = mesh.boundaryMesh();
-
-    forAll(pbm, patchi)
+    for (const polyPatch& pp : mesh.boundaryMesh())
     {
-        if (isA<wallPolyPatch>(pbm[patchi]))
+        if (isA<wallPolyPatch>(pp))
         {
-            const polyPatch& pp = pbm[patchi];
             forAll(pp.faceCells(), faceI)
             {
                 const label pCelli = pp.faceCells()[faceI];
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H
index 26f293fe07..d8a92b9666 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H
@@ -115,7 +115,6 @@ SourceFiles
 #ifndef meltingEvaporationModels_kineticGasEvaporation_H
 #define meltingEvaporationModels_kineticGasEvaporation_H
 
-
 #include "InterfaceCompositionModel.H"
 
 // * * * * * * * * * * * * * * * * *  * * * * * * * * * * * * * * * * * * * *//
@@ -123,13 +122,14 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class phasePair;
 
 namespace meltingEvaporationModels
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class kineticGasEvaporation
+                    Class kineticGasEvaporation Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Thermo, class OtherThermo>
@@ -137,7 +137,7 @@ class kineticGasEvaporation
 :
     public InterfaceCompositionModel<Thermo, OtherThermo>
 {
-    // Private data
+    // Private Data
 
         //- Evaporation coefficient
         dimensionedScalar C_;
@@ -161,7 +161,7 @@ class kineticGasEvaporation
         scalar isoAlpha_;
 
 
-    // Private member
+    // Private Member Functions
 
         //- Update interface
         void updateInterface(const volScalarField& T);
@@ -212,8 +212,8 @@ public:
         //- Return Tactivate
         virtual const dimensionedScalar& Tactivate() const;
 
-        //- Adds and substract alpha*div(U) as a source term
-        //  for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
+        //- Add/subtract alpha*div(U) as a source term
+        //- for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
         virtual bool includeDivU();
 };
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
index 0abc85f561..2f027a0de4 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C
@@ -26,9 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "MassTransferPhaseSystem.H"
-
 #include "HashPtrTable.H"
-
 #include "fvcDiv.H"
 #include "fvmSup.H"
 #include "fvMatrix.H"
@@ -85,23 +83,20 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::calculateL
     const volScalarField& T
 ) const
 {
-    tmp<volScalarField> tL
+    auto tL = tmp<volScalarField>::New
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "tL",
-                this->mesh().time().timeName(),
-                this->mesh(),
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
+            "tL",
+            this->mesh().time().timeName(),
             this->mesh(),
-            dimensionedScalar(dimEnergy/dimMass, Zero)
-        )
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        this->mesh(),
+        dimensionedScalar(dimEnergy/dimMass, Zero)
     );
-    volScalarField& L = tL.ref();
+    auto& L = tL.ref();
 
     if (massTransferModels_.found(keyik))
     {
@@ -110,10 +105,7 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::calculateL
 
         word speciesName = interfacePtr->transferSpecie();
 
-        auto tempOpen = speciesName.find('.');
-
-        //const word species(speciesName(0, tempOpen));
-        const word species(speciesName.substr(0, tempOpen));
+        const word species(speciesName.substr(0, speciesName.find('.')));
 
         L -= neg(dmdtNetki)*interfacePtr->L(species, T);
     }
@@ -125,9 +117,7 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::calculateL
 
         word speciesName = interfacePtr->transferSpecie();
 
-        auto tempOpen = speciesName.find('.');
-
-        const word species(speciesName.substr(0, tempOpen));
+        const word species(speciesName.substr(0, speciesName.find('.')));
 
         L += pos(dmdtNetki)*interfacePtr->L(species, T);
     }
@@ -145,22 +135,18 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::dmdt
     const phasePairKey& key
 ) const
 {
-    tmp<volScalarField> tdmdt
+    auto tdmdt = tmp<volScalarField>::New
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "dmdt",
-                this->mesh().time().timeName(),
-                this->mesh()
-            ),
-            this->mesh(),
-            dimensionedScalar(dimDensity/dimTime, Zero)
-        )
+            "dmdt",
+            this->mesh().time().timeName(),
+            this->mesh()
+        ),
+        this->mesh(),
+        dimensionedScalar(dimDensity/dimTime, Zero)
     );
-
-    volScalarField& dmdt = tdmdt.ref();
+    auto& dmdt = tdmdt.ref();
 
     if (dmdt_.found(key))
     {
@@ -178,12 +164,8 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::heatTransfer
     const volScalarField& T
 )
 {
-    tmp<fvScalarMatrix> tEqnPtr
-    (
-        new fvScalarMatrix(T, dimEnergy/dimTime)
-    );
-
-    fvScalarMatrix& eqn = tEqnPtr.ref();
+    auto teqn = tmp<fvScalarMatrix>::New(T, dimEnergy/dimTime);
+    auto& eqn = teqn.ref();
 
     forAllConstIters(this->phaseModels_, iteri)
     {
@@ -204,53 +186,44 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::heatTransfer
                 const phasePairKey keyki(phasek.name(), phasei.name(), true);
 
                 // Net mass transfer from k to i phase
-                tmp<volScalarField> tdmdtNetki
+                auto tdmdtNetki = tmp<volScalarField>::New
                 (
-                    new volScalarField
+                    IOobject
                     (
-                        IOobject
-                        (
-                            "tdmdtYki",
-                            this->mesh().time().timeName(),
-                            this->mesh()
-                        ),
-                        this->mesh(),
-                        dimensionedScalar(dimDensity/dimTime, Zero)
-                    )
+                        "tdmdtYki",
+                        this->mesh().time().timeName(),
+                        this->mesh()
+                    ),
+                    this->mesh(),
+                    dimensionedScalar(dimDensity/dimTime, Zero)
                 );
-                volScalarField& dmdtNetki = tdmdtNetki.ref();
+                auto& dmdtNetki = tdmdtNetki.ref();
 
-                tmp<volScalarField> tSp
+                auto tSp = tmp<volScalarField>::New
                 (
-                    new volScalarField
+                    IOobject
                     (
-                        IOobject
-                        (
-                            "Sp",
-                            this->mesh().time().timeName(),
-                            this->mesh()
-                        ),
-                        this->mesh(),
-                        dimensionedScalar(dimDensity/dimTime/dimTemperature, Zero)
-                    )
+                        "Sp",
+                        this->mesh().time().timeName(),
+                        this->mesh()
+                    ),
+                    this->mesh(),
+                    dimensionedScalar(dimDensity/dimTime/dimTemperature, Zero)
                 );
-                volScalarField& Sp = tSp.ref();
+                auto& Sp = tSp.ref();
 
-                tmp<volScalarField> tSu
+                auto tSu = tmp<volScalarField>::New
                 (
-                    new volScalarField
+                    IOobject
                     (
-                        IOobject
-                        (
-                            "Su",
-                            this->mesh().time().timeName(),
-                            this->mesh()
-                        ),
-                        this->mesh(),
-                        dimensionedScalar(dimDensity/dimTime, Zero)
-                    )
+                        "Su",
+                        this->mesh().time().timeName(),
+                        this->mesh()
+                    ),
+                    this->mesh(),
+                    dimensionedScalar(dimDensity/dimTime, Zero)
                 );
-                volScalarField& Su = tSu.ref();
+                auto& Su = tSu.ref();
 
 
                 if (massTransferModels_.found(keyik))
@@ -322,7 +295,7 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::heatTransfer
             }
         }
     }
-    return tEqnPtr;
+    return teqn;
 }
 
 
@@ -333,44 +306,34 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::volTransfer
     const volScalarField& p
 )
 {
-    tmp<fvScalarMatrix> tEqnPtr
-    (
-        new fvScalarMatrix(p, dimVolume/dimTime)
-    );
+    auto teqn = tmp<fvScalarMatrix>::New(p, dimVolume/dimTime);
+    auto& eqn = teqn.ref();
 
-    fvScalarMatrix& eqn = tEqnPtr.ref();
-
-    tmp<volScalarField> tSp
+    auto tSp = tmp<volScalarField>::New
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "Sp",
-                this->mesh().time().timeName(),
-                this->mesh()
-            ),
-            this->mesh(),
-            dimensionedScalar(dimless/dimTime/dimPressure, Zero)
-        )
+            "Sp",
+            this->mesh().time().timeName(),
+            this->mesh()
+        ),
+        this->mesh(),
+        dimensionedScalar(dimless/dimTime/dimPressure, Zero)
     );
-    volScalarField& Sp = tSp.ref();
+    auto& Sp = tSp.ref();
 
-    tmp<volScalarField> tSu
+    auto tSu = tmp<volScalarField>::New
     (
-        new volScalarField
+        IOobject
         (
-            IOobject
-            (
-                "Su",
-                this->mesh().time().timeName(),
-                this->mesh()
-            ),
-            this->mesh(),
-            dimensionedScalar(dimless/dimTime, Zero)
-        )
+            "Su",
+            this->mesh().time().timeName(),
+            this->mesh()
+        ),
+        this->mesh(),
+        dimensionedScalar(dimless/dimTime, Zero)
     );
-    volScalarField& Su = tSu.ref();
+    auto& Su = tSu.ref();
 
     forAllConstIters(this->totalPhasePairs(), iter)
     {
@@ -482,7 +445,7 @@ Foam::MassTransferPhaseSystem<BasePhaseSystem>::volTransfer
     }
 
     eqn += fvm::Sp(Sp, p) + Su;
-    return tEqnPtr;
+    return teqn;
 }
 
 
@@ -544,7 +507,7 @@ void Foam::MassTransferPhaseSystem<BasePhaseSystem>::alphaTransfer
     SuSpTable& Sp
 )
 {
-    // This term adds and substract alpha*div(U) as a source term
+    // This term adds/subtracts alpha*div(U) as a source term
     // for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2)
     bool includeDivU(true);
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H
index 0b2aa5b6f3..71498129f8 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H
@@ -85,7 +85,7 @@ protected:
             dmdtTable;
 
 
-    // Protected data
+    // Protected Data
 
         //- Overall inter-phase mass transfer rates [Kg/s]
         dmdtTable dmdt_;
@@ -94,7 +94,7 @@ protected:
         massTransferModelTable massTransferModels_;
 
 
-    // Protected memebers
+    // Protected Member Functions
 
         //- Calculate L between phases
         tmp<volScalarField> calculateL
@@ -111,7 +111,7 @@ public:
     // Constructors
 
         //- Construct from fvMesh
-        MassTransferPhaseSystem(const fvMesh&);
+        explicit MassTransferPhaseSystem(const fvMesh&);
 
 
     //- Destructor
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
index 3d12b3308d..4739d70da7 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
@@ -53,6 +53,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class surfaceTensionModel;
 class porousModel;
 
@@ -267,7 +268,7 @@ public:
     // Energy related thermo functionaliy functions
 
         //- Return access to the inernal energy field [J/Kg]
-        // NOTE: this mixture thermo is prepared to to work with T
+        //  \note this mixture thermo is prepared to work with T
         virtual volScalarField& he()
         {
             NotImplemented;
@@ -275,7 +276,7 @@ public:
         }
 
         //- Return access to the inernal energy field [J/Kg]
-        // NOTE: this mixture thermo is prepared to to work with T
+        //  \note this mixture thermo is prepared to work with T
         virtual const volScalarField& he() const
         {
            NotImplemented;
@@ -552,7 +553,7 @@ public:
         }
 
         //- Correct the turbulence
-        // (NOTE: Each phase could have its own turbulence)
+        //  \note Each phase could have its own turbulence
         virtual void correctTurbulence();
 
         //- Read base phaseProperties dictionary
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
index 8ca6ef800a..598d66a243 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
@@ -227,16 +227,8 @@ TSource() const
 {
     const volScalarField& T = mesh_.lookupObject<volScalarField>("T");
 
-    tmp<fvScalarMatrix> tTSource
-    (
-        new fvScalarMatrix
-        (
-            T,
-            dimEnergy/dimTime
-        )
-    );
-
-    fvScalarMatrix& TSource = tTSource.ref();
+    auto tTSource = tmp<fvScalarMatrix>::New(T, dimEnergy/dimTime);
+    auto& TSource = tTSource.ref();
 
     const twoPhaseMixtureEThermo& thermo =
         refCast<const twoPhaseMixtureEThermo>
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
index c29cedb820..5f5ea89946 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.H
@@ -109,6 +109,7 @@ public:
             const fvMesh& mesh
         );
 
+
     //- Destructor
     virtual ~interfaceHeatResistance() = default;
 
diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 11280ef3cc..d009993f97 100644
--- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -949,7 +949,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs()
                         );
 
                         // alphat is added alphal and multiplied by phase
-                        // alphaFilm in the coupled BC. We substract
+                        // alphaFilm in the coupled BC. We subtract
                         // alpha and divide by phase to get a net alphaFilm
                         this->operator[](i) =
                             (
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README
index 7043c87bd6..6efcd92454 100644
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/README
@@ -3,5 +3,4 @@ kineticGasEvaporation model test case
 Still evaporating pool with heat flux from bottom.
 
 The theoretical area-averaged mass flux evaporating is 1.2e-4 Kg/s.
-This averaged value is reached approximately at 110 secs 
-
+This averaged value is reached approximately at 110 secs.
diff --git a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
index 58fc138313..336a30ebd2 100755
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/poolEvaporation/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.25;
+scale   0.25;
 
 vertices
 (