diff --git a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
index cc12c10e11..f93a89bc73 100644
--- a/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/basicSolidThermo/basicSolidThermo.H
@@ -50,7 +50,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class basicSolidThermo Declaration
+                      Class basicSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicSolidThermo
@@ -109,8 +109,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~basicSolidThermo();
+    virtual ~basicSolidThermo();
 
 
     // Member functions
@@ -204,7 +203,7 @@ public:
         //- Read thermophysicalProperties dictionary
         virtual bool read() = 0;
 
-        // Ostream Operator
+        //- Ostream Operator
         friend Ostream& operator<<(Ostream& os, const basicSolidThermo& s);
 };
 
diff --git a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
index 33966637db..aff314ae73 100644
--- a/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/constSolidThermo/constSolidThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class constSolidThermo Declaration
+                      Class constSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class constSolidThermo
@@ -159,11 +159,8 @@ public:
             //- Read solidThermophysicalProperties dictionary
             bool read(const dictionary&);
 
-
-
-        // Ostream Operator
-
-        friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
+            //- Ostream Operator
+            friend Ostream& operator<<(Ostream& os, const constSolidThermo& s);
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
index 1e06ece31a..908db0b62a 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.C
@@ -309,8 +309,8 @@ void Foam::directionalKSolidThermo::correct()
 }
 
 
-const Foam::volSymmTensorField& Foam::directionalKSolidThermo::
-directionalK() const
+const Foam::volSymmTensorField&
+Foam::directionalKSolidThermo::directionalK() const
 {
     return directionalK_;
 }
diff --git a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
index b0fcfd5c8c..e1ee3cba9f 100644
--- a/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/directionalKSolidThermo/directionalKSolidThermo.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class directionalKSolidThermo Declaration
+                  Class directionalKSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class directionalKSolidThermo
@@ -99,8 +99,8 @@ public:
         directionalKSolidThermo(const fvMesh& mesh);
 
 
-    // Destructor
-        virtual ~directionalKSolidThermo();
+    //- Destructor
+    virtual ~directionalKSolidThermo();
 
 
     // Member Functions
@@ -136,14 +136,12 @@ public:
             //- Read the directionalKSolidThermo properties
             bool read(const dictionary& dict);
 
-
-        // Ostream Operator
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const directionalKSolidThermo& s
-        );
+            //- Ostream Operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const directionalKSolidThermo& s
+            );
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
index 03fad75d4a..9e08c9bd16 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.C
@@ -31,7 +31,6 @@ License
 
 Foam::interpolateSolid::interpolateSolid(const dictionary& dict)
 {
-
     read(dict);
 
     Info<< "Constructed directionalKSolidThermo with samples" << nl
@@ -108,4 +107,6 @@ bool Foam::interpolateSolid::read(const dictionary& dict)
     sigmaSValues_ = Field<scalar>(dict.lookup("sigmaSValues"));
     return true;
 }
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
index 20d72d35db..41c6468d48 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolateSolid/interpolateSolid.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                            Class interpolateSolid Declaration
+                     Class interpolateSolid Declaration
 \*---------------------------------------------------------------------------*/
 
 class interpolateSolid
@@ -77,8 +77,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~interpolateSolid();
+    virtual ~interpolateSolid();
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
index 24bb8ac695..d604b160be 100644
--- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class interpolatedSolidThermo Declaration
+                  Class interpolatedSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class interpolatedSolidThermo
@@ -119,14 +119,12 @@ public:
             //- Read the interpolatedSolidThermo properties
             bool read(const dictionary& dict);
 
-
-        // Ostream Operator
-
-        friend Ostream& operator<<
-        (
-            Ostream& os,
-            const interpolatedSolidThermo& s
-        );
+            //- Ostream Operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const interpolatedSolidThermo& s
+            );
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
index 6366d8e473..a54e386c38 100644
--- a/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/isotropicKSolidThermo/isotropicKSolidThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class isotropicKSolidThermo Declaration
+                  Class isotropicKSolidThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class isotropicKSolidThermo
@@ -71,9 +71,10 @@ public:
         isotropicKSolidThermo(const fvMesh& mesh);
 
 
-    // Destructor
+    //- Destructor
     virtual ~isotropicKSolidThermo();
 
+
     // Member functions
 
         //- Update properties
@@ -102,9 +103,7 @@ public:
         //- Write properties
         virtual bool writeData(Ostream& os) const;
 
-
-    // Ostream Operator
-
+        //- Ostream Operator
         friend Ostream& operator<<
         (
             Ostream& os,
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
index 54519fe2f9..ed9a33753e 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/multiComponentSolidMixture/multiComponentSolidMixture.H
@@ -43,8 +43,9 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class multiComponentSolidMixture Declaration
+                 Class multiComponentSolidMixture Declaration
 \*---------------------------------------------------------------------------*/
+
 template<class ThermoSolidType>
 class multiComponentSolidMixture
 :
@@ -65,6 +66,7 @@ class multiComponentSolidMixture
         //- Return molar fraction for component i in celli and at T
         scalar X(label i, label celli, scalar T) const;
 
+
 public:
 
 
@@ -75,9 +77,8 @@ public:
 
 
     //- Destructor
-
-        virtual ~multiComponentSolidMixture()
-        {}
+    virtual ~multiComponentSolidMixture()
+    {}
 
 
     // Member Functions
@@ -92,7 +93,7 @@ public:
         void read(const dictionary&);
 
 
-        // Cell based properties.
+        // Cell-based properties
 
             //- Density
             virtual scalar rho(scalar T, label celli) const;
@@ -118,9 +119,8 @@ public:
             //- Total enthalpy
             virtual scalar h(scalar T, label celli) const;
 
-            //- Cp
+            //- Specific heat capacity
             virtual scalar Cp(scalar T, label celli) const;
-
 };
 
 
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
index d13de54c2b..8db3a8fd28 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/mixtures/reactingSolidMixture/reactingSolidMixture.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class reactingSolidMixture Declaration
+                    Class reactingSolidMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoSolidType>
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
index 9824445cfc..569525e20d 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C
@@ -104,8 +104,7 @@ void Foam::solidMixtureThermo<MixtureType>::correct()
 
 
 template<class MixtureType>
-const Foam::volScalarField&
-Foam::solidMixtureThermo<MixtureType>::K() const
+const Foam::volScalarField& Foam::solidMixtureThermo<MixtureType>::K() const
 {
     return K_;
 }
@@ -220,8 +219,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::rho
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::rho
 (
     const label patchI
 ) const
@@ -243,8 +241,7 @@ Foam::solidMixtureThermo<MixtureType>::rho
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::Cp
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Cp
 (
     const label patchI
 ) const
@@ -266,8 +263,7 @@ Foam::solidMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::hs
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::hs
 (
     const label patchI
 ) const
@@ -289,8 +285,7 @@ Foam::solidMixtureThermo<MixtureType>::hs
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::K
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
 (
     const label patchI
 ) const
@@ -312,8 +307,7 @@ Foam::solidMixtureThermo<MixtureType>::K
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::Hf
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Hf
 (
     const label patchI
 ) const
@@ -335,8 +329,7 @@ Foam::solidMixtureThermo<MixtureType>::Hf
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::sigmaS
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::sigmaS
 (
     const label patchI
 ) const
@@ -359,8 +352,7 @@ Foam::solidMixtureThermo<MixtureType>::sigmaS
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::kappa
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
 (
     const label patchI
 ) const
@@ -383,8 +375,7 @@ Foam::solidMixtureThermo<MixtureType>::kappa
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField>
-Foam::solidMixtureThermo<MixtureType>::emissivity
+Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::emissivity
 (
     const label patchI
 ) const
diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
index d9b2fdf157..a8c2f9e3e4 100644
--- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
+++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.H
@@ -43,7 +43,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                  Class solidMixtureThermo Declaration
+                    Class solidMixtureThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class MixtureType>
@@ -81,8 +81,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~solidMixtureThermo();
+    virtual ~solidMixtureThermo();
 
 
     // Member functions
@@ -122,8 +121,8 @@ public:
 
         // Patches variables
 
-       
-            //- Density [kg/m3]     
+
+            //- Density [kg/m3]
             virtual tmp<scalarField> rho(const label patchI) const;
 
             //- Specific heat capacity [J/(kg.K)]
@@ -148,13 +147,11 @@ public:
             virtual tmp<scalarField> emissivity(const label patchI) const;
 
 
-
         //- Read thermophysicalProperties dictionary
         virtual bool read();
 
         //- Write the basicSolidThermo properties
         virtual bool writeData(Ostream& os) const;
-
 };
 
 
diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C b/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
index cb6440c604..23fa254e2c 100644
--- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
+++ b/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C
@@ -73,17 +73,16 @@ Foam::autoPtr<Foam::pointSolidMixture> Foam::pointSolidMixture::New
     const dictionary& thermophysicalProperties
 )
 {
-    return autoPtr<pointSolidMixture>(new
-pointSolidMixture(thermophysicalProperties));
+    return autoPtr<pointSolidMixture>
+    (
+        new pointSolidMixture(thermophysicalProperties)
+    );
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalarField Foam::pointSolidMixture::X
-(
-    const scalarField& Y
-) const
+Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const
 {
     scalarField X(Y.size());
     scalar rhoInv = 0.0;
@@ -97,10 +96,7 @@ Foam::scalarField Foam::pointSolidMixture::X
 }
 
 
-Foam::scalar Foam::pointSolidMixture::rho
-(
-    const scalarField& X
-) const
+Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const
 {
     scalar val = 0.0;
     forAll(properties_, i)
@@ -111,10 +107,7 @@ Foam::scalar Foam::pointSolidMixture::rho
 }
 
 
-Foam::scalar Foam::pointSolidMixture::Cp
-(
-    const scalarField& Y
-) const
+Foam::scalar Foam::pointSolidMixture::Cp(const scalarField& Y) const
 {
     scalar val = 0.0;
     forAll(properties_, i)
diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H b/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
index fba0d739ae..540e00dbaa 100644
--- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
+++ b/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H
@@ -55,7 +55,7 @@ Ostream& operator<<
 
 
 /*---------------------------------------------------------------------------*\
-                            Class pointSolid Declaration
+                       Class pointSolid Declaration
 \*---------------------------------------------------------------------------*/
 
 class pointSolid