diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
index e092cddf0..cbfc0e804 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C
@@ -161,7 +161,8 @@ void fixedNormalSlipFvPatchField<Type>::evaluate(const Pstream::commsTypes)
 
 
 template<class Type>
-tmp<Field<Type> > fixedNormalSlipFvPatchField<Type>::snGradTransformDiag() const
+tmp<Field<Type> >
+fixedNormalSlipFvPatchField<Type>::snGradTransformDiag() const
 {
     vectorField nHat = this->patch().nf();
     vectorField diag(nHat.size());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
index 42135f3a2..7e67893b8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.C
@@ -170,7 +170,7 @@ tmp<Field<Type> > partialSlipFvPatchField<Type>::snGradTransformDiag() const
     diag.replace(vector::Y, mag(nHat.component(vector::Y)));
     diag.replace(vector::Z, mag(nHat.component(vector::Z)));
 
-    return 
+    return
         valueFraction_*pTraits<Type>::one
       + (1.0 - valueFraction_)
        *transformFieldMask<Type>(pow<vector, pTraits<Type>::rank>(diag));
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index a20b97854..3f4c66f9e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -50,6 +50,21 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 {}
 
 
+template<class Type>
+waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    advectiveFvPatchField<Type>(p, iF, dict),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    gamma_(readScalar(dict.lookup("gamma")))
+{}
+
+
 template<class Type>
 waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
@@ -66,21 +81,6 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 {}
 
 
-template<class Type>
-waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
-(
-    const fvPatch& p,
-    const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    advectiveFvPatchField<Type>(p, iF, dict),
-    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    gamma_(readScalar(dict.lookup("gamma")))
-{}
-
-
 template<class Type>
 waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 (
@@ -89,7 +89,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 :
     advectiveFvPatchField<Type>(ptpsf),
     psiName_(ptpsf.psiName_),
-    UName_(ptpsf.psiName_),
+    UName_(ptpsf.UName_),
     gamma_(ptpsf.gamma_)
 {}
 
@@ -201,7 +201,7 @@ void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
     {
         os.writeKeyword("psi") << psiName_ << token::END_STATEMENT << nl;
     }
-    
+
     os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
 
     if (this->lInf_ > SMALL)
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 4255cd7c0..991a3bfa7 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -166,19 +166,19 @@ public:
 
 // Add the patch constructor functions to the hash tables
 
-#define makeFvDivTypeScheme(SS, Type)                                          \
-                                                                               \
-defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                              \
-                                                                               \
-divScheme<Type>::addIstreamConstructorToTable<SS<Type> >                       \
+#define makeFvDivTypeScheme(SS, Type)                                         \
+                                                                              \
+defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                             \
+                                                                              \
+divScheme<Type>::addIstreamConstructorToTable<SS<Type> >                      \
     add##SS##Type##IstreamConstructorToTable_;
 
 
-#define makeFvDivScheme(SS)                                                    \
-                                                                               \
-makeFvDivTypeScheme(SS, vector)                                                \
-makeFvDivTypeScheme(SS, sphericalTensor)                                       \
-makeFvDivTypeScheme(SS, symmTensor)                                            \
+#define makeFvDivScheme(SS)                                                   \
+                                                                              \
+makeFvDivTypeScheme(SS, vector)                                               \
+makeFvDivTypeScheme(SS, sphericalTensor)                                      \
+makeFvDivTypeScheme(SS, symmTensor)                                           \
 makeFvDivTypeScheme(SS, tensor)
 
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index 17414dac2..101f22de4 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -21,7 +21,7 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-    
+
 \*---------------------------------------------------------------------------*/
 
 #include "gaussGrad.H"
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index c955790b7..d53c95bee 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -85,7 +85,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::meshToMesh
             {
                 label baseFaceI = faceMap[subPatch.patch().start()+i];
 
-                if (baseFaceI >= baseStart && baseFaceI < baseStart+baseSize)
+                if (baseFaceI >= baseStart && baseFaceI < baseStart + baseSize)
                 {
                     directAddressing[i] = baseFaceI-baseStart;
                 }
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.C
index 3a375f3eb..c1bd90038 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.C
@@ -116,7 +116,7 @@ DeferredCorrectionLimitedScheme<Type, Limiter, LimitFunc>::limiter
 
     surfaceScalarField::GeometricBoundaryField& bLim = lim.boundaryField();
 
-    forAll(bLim, patchi)
+    forAll (bLim, patchi)
     {
         scalarField& pLim = bLim[patchi];
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H
index 3f2edf3a0..3772345ed 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H
@@ -111,7 +111,7 @@ public:
             upwindScheme_(mesh, faceFlux)
         {}
 
-        //- Construct from mesh and Istream. 
+        //- Construct from mesh and Istream
         //  The name of the flux field is read from the Istream and looked-up
         //  from the mesh objectRegistry
         DeferredCorrectionLimitedScheme