diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
index 4162235798..a74fa5c154 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H
@@ -128,9 +128,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~basicSubGrid();
+    //- Destructor
+    virtual ~basicSubGrid();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
index 5761805d8f..a068130df6 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H
@@ -107,9 +107,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~basicSubGrid();
+    //- Destructor
+    virtual ~basicSubGrid();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
index 5935ac889e..5a680e4479 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
@@ -137,9 +137,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~PDRDragModel();
+    //- Destructor
+    virtual ~PDRDragModel();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
index be29419738..37a99488b9 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H
@@ -135,9 +135,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~basic();
+    //- Destructor
+    virtual ~basic();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
index 3c3dad96a5..358408fd1d 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~Gulder();
+    //- Destructor
+    virtual ~Gulder();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
index 66a903c2ba..94dd8f8f9f 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H
@@ -91,9 +91,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SCOPEBlend();
+    //- Destructor
+    virtual ~SCOPEBlend();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
index 4c16d0e3df..11828420d5 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H
@@ -96,9 +96,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SCOPEXiEq();
+    //- Destructor
+    virtual ~SCOPEXiEq();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
index b29ee73741..20aa33ca4d 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
@@ -132,9 +132,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~XiEqModel();
+    //- Destructor
+    virtual ~XiEqModel();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
index a746ceb89f..d703b30308 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H
@@ -90,9 +90,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~instability();
+    //- Destructor
+    virtual ~instability();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
index 1573897777..82b801df0d 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H
@@ -85,9 +85,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~KTS();
+    //- Destructor
+    virtual ~KTS();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
index 8080ea8f76..d9fd7eafc6 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
@@ -129,9 +129,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~XiGModel();
+    //- Destructor
+    virtual ~XiGModel();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
index 75337b40d0..bf8ad5af85 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~instabilityG();
+    //- Destructor
+    virtual ~instabilityG();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
index 9fb27b3df0..bfa0b30523 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
@@ -200,9 +200,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~XiModel();
+    //- Destructor
+    virtual ~XiModel();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
index 78366ccb24..9093c0dd45 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~algebraic();
+    //- Destructor
+    virtual ~algebraic();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
index 79399d66b8..50252b94d2 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H
@@ -83,9 +83,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fixed();
+    //- Destructor
+    virtual ~fixed();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
index f39f3b34ec..b6b000cc78 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~transport();
+    //- Destructor
+    virtual ~transport();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
index 30703dbdf4..29c43803b5 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H
@@ -194,7 +194,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     ~SCOPE();
 
 
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H b/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
index a6e6ed9a8c..ad8b8837e3 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
+++ b/applications/solvers/combustion/fireFoam/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.H
@@ -88,9 +88,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~infinitelyFastChemistry();
+    //- Destructor
+    virtual ~infinitelyFastChemistry();
 
 
     // Member Functions
diff --git a/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H b/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
index a183313ab1..1ff9a95d77 100644
--- a/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
+++ b/applications/solvers/combustion/fireFoam/combustionModels/noCombustion/noCombustion.H
@@ -83,9 +83,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~noCombustion();
+    //- Destructor
+    virtual ~noCombustion();
 
     // Member Functions
 
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
index 599ef1070c..5c23d3d421 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
@@ -77,9 +77,8 @@ public:
         regionProperties(const Time& runTime);
 
 
-    // Destructor
-
-        ~regionProperties();
+    //- Destructor
+    ~regionProperties();
 
 
     // Member Functions
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/files b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/files
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/files
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/Make/options
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointContinuityErrs.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointContinuityErrs.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointContinuityErrs.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/createFields.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
diff --git a/applications/solvers/incompressible/ajointShapeOptimizationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
similarity index 100%
rename from applications/solvers/incompressible/ajointShapeOptimizationFoam/createPhia.H
rename to applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
index f7c2caf8c6..9c196e2905 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
@@ -84,7 +84,7 @@
 
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         fields.add(Y[i]);
     }
diff --git a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
index c2bbf31d12..4ac6a84b41 100644
--- a/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
+++ b/applications/solvers/multiphase/interMixingFoam/incompressibleThreePhaseMixture/threePhaseMixture.H
@@ -94,10 +94,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~threePhaseMixture()
-        {}
+    //- Destructor
+    ~threePhaseMixture()
+    {}
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
index 0145b596af..46999b972a 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H
@@ -96,10 +96,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~Kunz()
-        {}
+    //- Destructor
+    virtual ~Kunz()
+    {}
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
index a9fdb8ac9c..b173a55601 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H
@@ -90,10 +90,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~Merkle()
-        {}
+    //- Destructor
+    virtual ~Merkle()
+    {}
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
index ea84887b88..0d67ef1b62 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H
@@ -103,10 +103,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SchnerrSauer()
-        {}
+    //- Destructor
+    virtual ~SchnerrSauer()
+    {}
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
index 0749c3ae1f..0aa466b06e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.H
@@ -121,10 +121,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~phaseChangeTwoPhaseMixture()
-        {}
+    //- Destructor
+    virtual ~phaseChangeTwoPhaseMixture()
+    {}
 
 
     // Member Functions
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 3249bfd3bd..1d94d47e91 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -209,10 +209,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~multiphaseMixture()
-        {}
+    //- Destructor
+    ~multiphaseMixture()
+    {}
 
 
     // Member Functions
diff --git a/applications/test/DLList/DLListTest.C b/applications/test/DLList/DLListTest.C
index 92db3b6651..4000dc90a1 100644
--- a/applications/test/DLList/DLListTest.C
+++ b/applications/test/DLList/DLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(DLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -64,12 +59,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using the same STL iterator: " << nl << endl;
 
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(DLList<scalar>, myList, iter)
     {
         Info<< "Removing " << myList.remove(iter) << endl;
     }
@@ -82,12 +72,7 @@ int main(int argc, char *argv[])
 
     const DLList<scalar>& const_myList = myList;
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -95,12 +80,7 @@ int main(int argc, char *argv[])
     myList.swapUp(myList.DLListBase::first());
     myList.swapUp(myList.DLListBase::last());
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -108,19 +88,14 @@ int main(int argc, char *argv[])
     myList.swapDown(myList.DLListBase::first());
     myList.swapDown(myList.DLListBase::last());
 
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
+    forAllConstIter(DLList<scalar>, const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
 
 
-    Info<< nl << "Testing transfer: " << nl << endl;
-    Info<< "original: " << myList << endl;
+    Info<< nl << "Testing transfer: " << nl << nl
+        << "original: " << myList << endl;
 
     DLList<scalar> newList;
     newList.transfer(myList);
diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C
index 138c185f4a..2844489f72 100644
--- a/applications/test/Dictionary/DictionaryTest.C
+++ b/applications/test/Dictionary/DictionaryTest.C
@@ -114,12 +114,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    for
-    (
-        Dictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
+    forAllConstIter(Dictionary<ent>, dict, iter)
     {
         Info<< "element : " << *iter;
     }
@@ -159,12 +154,7 @@ int main(int argc, char *argv[])
     }
 
     Info<< nl << "scalarDict1: " << endl;
-    for
-    (
-        PtrDictionary<Scalar>::const_iterator iter = scalarDict.begin();
-        iter != scalarDict.end();
-        ++iter
-    )
+    forAllConstIter(PtrDictionary<Scalar>, scalarDict, iter)
     {
         Info<< " = " << iter() << endl;
     }
@@ -176,12 +166,7 @@ int main(int argc, char *argv[])
         scalarDict2.insert(key, new Scalar(1.3*i));
     }
     Info<< nl << "scalarDict2: " << endl;
-    for
-    (
-        PtrDictionary<Scalar>::const_iterator iter = scalarDict2.begin();
-        iter != scalarDict2.end();
-        ++iter
-    )
+    forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
     {
         Info<< "elem = " << *iter << endl;
     }
diff --git a/applications/test/ISLList/ISLListTest.C b/applications/test/ISLList/ISLListTest.C
index bd390f38d3..1991aa4f24 100644
--- a/applications/test/ISLList/ISLListTest.C
+++ b/applications/test/ISLList/ISLListTest.C
@@ -78,12 +78,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -92,14 +87,9 @@ int main(int argc, char *argv[])
 
     const ISLList<Scalar>& const_myList = myList;
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
 
diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/PackedListTest2.C
index 5a04ece832..362e5cd8d0 100644
--- a/applications/test/PackedList2/PackedListTest2.C
+++ b/applications/test/PackedList2/PackedListTest2.C
@@ -188,12 +188,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::iterator it = packed.begin();
-            it != packed.end();
-            ++it
-        )
+        forAllIter(PackedBoolList, packed, it)
         {
             sum += it;
         }
@@ -207,12 +202,7 @@ int main(int argc, char *argv[])
     sum = 0;
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::const_iterator cit = packed.cbegin();
-            cit != packed.cend();
-            ++cit
-        )
+        forAllConstIter(PackedBoolList, packed, cit)
         {
             sum += cit();
         }
@@ -333,12 +323,7 @@ int main(int argc, char *argv[])
     // Write packed
     for (label iter = 0; iter < nIters; ++iter)
     {
-        for
-        (
-            PackedBoolList::iterator it = packed.begin();
-            it != packed.end();
-            ++it
-        )
+        forAllIter(PackedBoolList, packed, it)
         {
             it() = 1;
         }
diff --git a/applications/test/SLList/SLListTest.C b/applications/test/SLList/SLListTest.C
index 3d40182df3..9a9e81c21f 100644
--- a/applications/test/SLList/SLListTest.C
+++ b/applications/test/SLList/SLListTest.C
@@ -51,12 +51,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -65,39 +60,23 @@ int main(int argc, char *argv[])
 
     const SLList<scalar>& const_myList = myList;
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
+    forAllIter(SLList<scalar>, myList, iter)
     {
         Info<< "Removing element:" << *iter << endl;
         myList.remove(iter);
     }
 
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
+    forAllConstIter(SLList<scalar>, const_myList, iter)
     {
-        Info<< "element:" << *iter2 << endl;
+        Info<< "element:" << *iter << endl;
     }
 
 
-
     for (int i = 0; i<10; i++)
     {
         myList.append(1.3*i);
diff --git a/applications/test/UDictionary/UDictionaryTest.C b/applications/test/UDictionary/UDictionaryTest.C
index 13571ffab4..57fc55c0b3 100644
--- a/applications/test/UDictionary/UDictionaryTest.C
+++ b/applications/test/UDictionary/UDictionaryTest.C
@@ -81,12 +81,7 @@ int main(int argc, char *argv[])
 
     dict.swapDown(dict.first());
 
-    for
-    (
-        UDictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
+    forAllConstIter(UDictionary<ent>, dict, iter)
     {
         Info<< "element : " << *iter;
     }
diff --git a/applications/test/ensightFoamReader/udr_checker-82.c b/applications/test/ensightFoamReader/udr_checker-90.c
similarity index 100%
rename from applications/test/ensightFoamReader/udr_checker-82.c
rename to applications/test/ensightFoamReader/udr_checker-90.c
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 01c428016e..c2f3640f2d 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -292,20 +292,14 @@ void addCutNeighbours
 
     labelHashSet addCutFaces(cutCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = cutCells.begin();
-        iter != cutCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cutCells, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cFaces = mesh.cells()[cellI];
 
         forAll(cFaces, i)
         {
-            label faceI = cFaces[i];
+            const label faceI = cFaces[i];
 
             if (mesh.isInternalFace(faceI))
             {
@@ -331,12 +325,7 @@ void addCutNeighbours
     Info<< "    Selected an additional " << addCutFaces.size()
         << " neighbours of cutCells to refine" << endl;
 
-    for
-    (
-        labelHashSet::const_iterator iter = addCutFaces.begin();
-        iter != addCutFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, addCutFaces, iter)
     {
         cutCells.insert(iter.key());
     }
@@ -386,21 +375,15 @@ bool limitRefinementLevel
 
     labelHashSet addCutCells(cutCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = cutCells.begin();
-        iter != cutCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cutCells, iter)
     {
         // cellI will be refined.
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cCells = mesh.cellCells()[cellI];
 
         forAll(cCells, i)
         {
-            label nbr = cCells[i];
+            const label nbr = cCells[i];
 
             if (!excludeCells.found(nbr) && !cutCells.found(nbr))
             {
@@ -419,12 +402,8 @@ bool limitRefinementLevel
         Info<< "Added an additional " << addCutCells.size() << " cells"
             << " to satisfy 1:" << limitDiff << " refinement level"
             << endl;
-        for
-        (
-            labelHashSet::const_iterator iter = addCutCells.begin();
-            iter != addCutCells.end();
-            ++iter
-        )
+
+        forAllConstIter(labelHashSet, addCutCells, iter)
         {
             cutCells.insert(iter.key());
         }
diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
index 89fb95f9a9..4b6347aac0 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
+++ b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
@@ -108,9 +108,8 @@ public:
         cellSplitter(const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~cellSplitter();
+    //- Destructor
+    ~cellSplitter();
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index fb7b97a32d..5e0ce9248f 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -112,12 +112,7 @@ int main(int argc, char *argv[])
             << cells.instance()/cells.local()/cells.name()
             << nl << endl;
 
-        for
-        (
-            cellSet::const_iterator iter = cells.begin();
-            iter != cells.end();
-            ++iter
-        )
+        forAllConstIter(cellSet, cells, iter)
         {
             cutCells.erase(iter.key());
         }
@@ -131,7 +126,7 @@ int main(int argc, char *argv[])
 
     forAll(meshPoints, pointI)
     {
-        label meshPointI = meshPoints[pointI];
+        const label meshPointI = meshPoints[pointI];
 
         vertOnPatch[meshPointI] = true;
     }
@@ -151,8 +146,7 @@ int main(int argc, char *argv[])
 
         forAll(pEdges, pEdgeI)
         {
-            label edgeI = pEdges[pEdgeI];
-
+            const label edgeI = pEdges[pEdgeI];
             const edge& e = mesh.edges()[edgeI];
 
             label otherPointI = e.otherVertex(meshPointI);
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index 1a55fd52f1..19828287bc 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -392,15 +392,9 @@ void collectCuts
     boolList edgeIsCut(mesh.nEdges(), false);
     scalarField edgeWeight(mesh.nEdges(), -GREAT);
 
-    for
-    (
-        cellSet::const_iterator iter = cellsToCut.begin();
-        iter != cellsToCut.end();
-        ++iter
-    )
+    forAllConstIter(cellSet, cellsToCut, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cEdges = cellEdges[cellI];
 
         forAll(cEdges, i)
diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
index 52a29eb03f..2fb1c77043 100644
--- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
+++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
@@ -268,13 +268,8 @@ int main(int argc, char *argv[])
 
     pointField points(slPoints.size());
 
-    label i=0;
-    for
-    (
-        SLList<point>::iterator pointIter = slPoints.begin();
-        pointIter != slPoints.end();
-        ++pointIter
-    )
+    label i = 0;
+    forAllConstIter(SLList<point>, slPoints, pointIter)
     {
         // Scale points for the given scale factor
         points[i++] = scaleFactor * pointIter();
@@ -283,13 +278,8 @@ int main(int argc, char *argv[])
 
     labelList pointMap(maxNodei+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator pointMapIter = slPointMap.begin();
-        pointMapIter != slPointMap.end();
-        ++pointMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slPointMap, pointMapIter)
     {
         pointMap[pointMapIter()] = i++;
     }
@@ -298,13 +288,8 @@ int main(int argc, char *argv[])
 
     labelList cellMap(maxCelli+1);
 
-    i=0;
-    for
-    (
-        SLList<label>::iterator cellMapIter = slCellMap.begin();
-        cellMapIter != slCellMap.end();
-        ++cellMapIter
-    )
+    i = 0;
+    forAllConstIter(SLList<label>, slCellMap, cellMapIter)
     {
         cellMap[cellMapIter()] = i++;
     }
@@ -323,12 +308,7 @@ int main(int argc, char *argv[])
     cellShapeList cellShapes(slCellLabels.size());
     label nCells = 0;
 
-    for
-    (
-        SLPtrList<labelList>::iterator cellIter = slCellLabels.begin();
-        cellIter != slCellLabels.end();
-        ++cellIter
-    )
+    forAllConstIter(SLPtrList<labelList>, slCellLabels, cellIter)
     {
         if      // Tetrahedron
         (
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/block.H b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
index 510fbe1b66..b315407be2 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/block.H
@@ -100,9 +100,8 @@ public:
             return autoPtr<block>(NULL);
         }
 
-    // Destructor
-
-        ~block();
+    //- Destructor
+    ~block();
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
index 71b82cfb07..6c50c02fcd 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
+++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
@@ -327,12 +327,7 @@ if
 {
     scalar minz = GREAT;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
@@ -346,12 +341,7 @@ if
 
     SLList<face> newLinerFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[LINER][0].begin();
-        iter != pFaces[LINER][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
     {
         const face& pf = iter();
 
@@ -380,12 +370,7 @@ if
 
     SLList<face> newCylinderHeadFaces;
 
-    for
-    (
-        SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
-        iter != pFaces[CYLINDERHEAD][0].end();
-        ++iter
-    )
+    forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
     {
         const face& pf = iter();
 
@@ -456,12 +441,7 @@ if (pFaces[WEDGE].size() && pFaces[WEDGE][0].size())
     {
         pFaces[CYCLIC].setSize(1);
         pFaces[CYCLIC][0] = pFaces[WEDGE][0];
-        for
-        (
-            SLList<face>::iterator iterb = pFaces[WEDGE][1].begin();
-            iterb != pFaces[WEDGE][1].end();
-            ++iterb
-        )
+        forAllIter(SLList<face>, pFaces[WEDGE][1], iterb)
         {
             pFaces[CYCLIC][0].append(iterb());
         }
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
index c6d37eb7f1..68bf227f9f 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
@@ -238,9 +238,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~sammMesh();
+    //- Destructor
+    ~sammMesh();
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
index 60b575ad60..b2efc519b3 100644
--- a/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
+++ b/applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
@@ -299,9 +299,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~starMesh();
+    //- Destructor
+    ~starMesh();
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index a3bf1a76e9..fedbe40610 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -468,12 +468,7 @@ int main(int argc, char *argv[])
          // Print region to patch mapping
         Info<< "Regions:" << endl;
 
-        for
-        (
-            Map<label>::const_iterator iter = regionToPatch.begin();
-            iter != regionToPatch.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, regionToPatch, iter)
         {
             Info<< "    region:" << iter.key() << '\t' << "patch:"
                 << iter() << endl;
diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
index a3a493258b..d0e067a070 100644
--- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
+++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
@@ -356,12 +356,7 @@ void writePointCells
 
     label vertI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = allEdges.begin();
-        iter != allEdges.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, allEdges, iter)
     {
         const edge& e = mesh.edges()[iter.key()];
 
diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
index 5496835381..dfcfb91471 100644
--- a/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
+++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
@@ -143,12 +143,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -183,12 +178,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -209,12 +199,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -1461,7 +1446,7 @@ int main(int argc, char *argv[])
 
         mesh.setInstance(meshInstance);
     }
-    
+
 
 
     // Change master and slave boundary conditions on originating mesh
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
index 559bab78eb..e5750935db 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
@@ -102,10 +102,9 @@ public:
         mergePolyMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~mergePolyMesh()
-        {}
+    //- Destructor
+    virtual ~mergePolyMesh()
+    {}
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
index 9d1f6ea0dd..dbfe36c36e 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
@@ -76,9 +76,8 @@ public:
         mirrorFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~mirrorFvMesh();
+    //- Destructor
+    ~mirrorFvMesh();
 
 
     // Member Functions
diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
index bb41dd57d0..8a30d3bdf8 100644
--- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
+++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
@@ -100,12 +100,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "pointSets:" << pointObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = pointObjects.begin();
-        iter != pointObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, pointObjects, iter)
     {
         // Not in memory. Load it.
         pointSet set(*iter());
@@ -149,12 +144,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "faceSets:" << faceObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = faceObjects.begin();
-        iter != faceObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, faceObjects, iter)
     {
         // Not in memory. Load it.
         faceSet set(*iter());
@@ -288,12 +278,7 @@ int main(int argc, char *argv[])
 
     //Pout<< "cellSets:" << cellObjects.names() << endl;
 
-    for
-    (
-        IOobjectList::const_iterator iter = cellObjects.begin();
-        iter != cellObjects.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, cellObjects, iter)
     {
         if (!slaveCellSets.found(iter.key()))
         {
diff --git a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
index e36c1aca0a..103d0f9097 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/regionSide.C
@@ -81,8 +81,7 @@ Foam::label Foam::regionSide::otherEdge
 
     forAll(fEdges, fEdgeI)
     {
-        label otherEdgeI = fEdges[fEdgeI];
-
+        const label otherEdgeI = fEdges[fEdgeI];
         const edge& otherE = mesh.edges()[otherEdgeI];
 
         if
@@ -300,15 +299,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
     //
     labelHashSet regionEdges(4*regionFaces.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = regionFaces.begin();
-        iter != regionFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, regionFaces, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const labelList& fEdges = mesh.faceEdges()[faceI];
 
         forAll(fEdges, fEdgeI)
@@ -326,12 +319,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
     labelHashSet visitedPoint(4*regionFaces.size());
 
     // Insert fence points so we don't visit them
-    for
-    (
-        labelHashSet::const_iterator iter = fencePoints.begin();
-        iter != fencePoints.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, fencePoints, iter)
     {
         visitedPoint.insert(iter.key());
     }
@@ -344,14 +332,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
         Info<< "Excluding visit of points:" << visitedPoint << endl;
     }
 
-    for
-    (
-        labelHashSet::const_iterator iter = regionFaces.begin();
-        iter != regionFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, regionFaces, iter)
     {
-        label faceI = iter.key();
+        const label faceI = iter.key();
 
         // Get side of face.
         label cellI;
@@ -459,12 +442,7 @@ Foam::regionSide::regionSide
 
     labelHashSet fencePoints(fenceEdges.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = fenceEdges.begin();
-        iter != fenceEdges.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, fenceEdges, iter)
     {
         const edge& e = mesh.edges()[iter.key()];
 
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 7da3c22269..1bac3a554b 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -99,12 +99,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -139,12 +134,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -165,12 +155,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 999884ddae..3b7bb42a1c 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
 
         labelList osf(slavePatch.size());
 
-        forAll (osf, i)
+        forAll(osf, i)
         {
             osf[i] = slavePatch.start() + i;
         }
diff --git a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
index 20bff4cc01..8945c0cf5e 100644
--- a/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
+++ b/applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
@@ -76,12 +76,7 @@ int main(int argc, char *argv[])
 
             if (args.optionFound("keywords") && !args.optionFound("entry"))
             {
-                for
-                (
-                    IDLList<entry>::iterator iter = dict.begin();
-                    iter != dict.end();
-                    ++iter
-                )
+                forAllConstIter(dictionary, dict, iter)
                 {
                     Info<< iter().keyword() << endl;
                 }
@@ -137,13 +132,8 @@ int main(int argc, char *argv[])
                         }
                         */
 
-                        const dictionary& dict(entPtr->dict());
-                        for
-                        (
-                            IDLList<entry>::const_iterator iter = dict.begin();
-                            iter != dict.end();
-                            ++iter
-                        )
+                        const dictionary& dict = entPtr->dict();
+                        forAllConstIter(dictionary, dict, iter)
                         {
                             Info<< iter().keyword() << endl;
                         }
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
index 1b22246090..b9dbb74c6f 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
@@ -126,9 +126,8 @@ public:
         domainDecomposition(const IOobject& io);
 
 
-    // Destructor
-
-        ~domainDecomposition();
+    //- Destructor
+    ~domainDecomposition();
 
 
     // Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 959aaf7031..d7487dc58e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -506,12 +506,7 @@ void Foam::domainDecomposition::decomposeMesh()
             // Add internal and boundary faces
             // Remember to increment the index by one such that the
             // turning index works properly.
-            for
-            (
-                SLList<label>::iterator curProcFacesIter = curProcFaces.begin();
-                curProcFacesIter != curProcFaces.end();
-                ++curProcFacesIter
-            )
+            forAllConstIter(SLList<label>, curProcFaces, curProcFacesIter)
             {
                 curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
                 nFaces++;
@@ -564,12 +559,11 @@ void Foam::domainDecomposition::decomposeMesh()
 
                 // add faces for this processor boundary
 
-                for
+                forAllConstIter
                 (
-                    SLList<label>::iterator curFacesIter =
-                        curInterProcBFacesIter().begin();
-                    curFacesIter != curInterProcBFacesIter().end();
-                    ++curFacesIter
+                    SLList<label>,
+                    curInterProcBFacesIter(),
+                    curFacesIter
                 )
                 {
                     // add the face
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
index b1cfd1008a..9a1a4e16d8 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
@@ -230,9 +230,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~fvFieldDecomposer();
+    //- Destructor
+    ~fvFieldDecomposer();
 
 
     // Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
index fa0510765b..010bb3758a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
@@ -55,7 +55,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
         {
             SLList<indexedParticle*>& particlePtrs = *cellParticles[celli];
 
-            forAllIter(SLList<indexedParticle*>, particlePtrs, iter)
+            forAllConstIter(SLList<indexedParticle*>, particlePtrs, iter)
             {
                 const indexedParticle& ppi = *iter();
                 particleIndices_[pi++] = ppi.index();
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index b684ac5808..3bfdbb7f93 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -138,9 +138,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~pointFieldDecomposer();
+    //- Destructor
+    ~pointFieldDecomposer();
 
 
     // Member Functions
diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C
index d6e05dd5cb..026e694829 100644
--- a/applications/utilities/parallelProcessing/decomposePar/readFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C
@@ -48,22 +48,13 @@ void Foam::readFields
     // Construct the vol scalar fields
     fields.setSize(fieldObjects.size());
 
-    label fieldi=0;
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    label fieldI = 0;
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         fields.set
         (
-            fieldi++,
-            new GeoField
-            (
-                *iter(),
-                mesh
-            )
+            fieldI++,
+            new GeoField(*iter(), mesh)
         );
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
index d4b6d13b95..d469054ca3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
@@ -110,34 +110,21 @@ int main(int argc, char *argv[])
         // Search list of objects for volScalarFields
         IOobjectList scalarFields(objects.lookupClass("volScalarField"));
 
-        for
-        (
-            IOobjectList::iterator scalarFieldIter = scalarFields.begin();
-            scalarFieldIter != scalarFields.end();
-            ++scalarFieldIter
-        )
+        forAllIter(IOobjectList, scalarFields, iter)
         {
             // Read field
-            volScalarField field
+            volScalarField field(*iter(), mesh);
+
+            // lookup field from dictionary and convert field
+            label unitNumber;
+            if
             (
-                *scalarFieldIter(),
-                mesh
-            );
-
-            // lookup field from dictionary
-            if (foamDataToFluentDict.found(field.name()))
+                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+             && unitNumber > 0
+            )
             {
-                label unitNumber
-                (
-                    readLabel(foamDataToFluentDict.lookup(field.name()))
-                );
-
-                // Convert field
-                if (unitNumber > 0)
-                {
-                    Info<< "    Converting field " << field.name() << endl;
-                    writeFluentField(field, unitNumber, fluentDataFile);
-                }
+                Info<< "    Converting field " << field.name() << endl;
+                writeFluentField(field, unitNumber, fluentDataFile);
             }
         }
 
@@ -148,34 +135,21 @@ int main(int argc, char *argv[])
         // Search list of objects for volVectorFields
         IOobjectList vectorFields(objects.lookupClass("volVectorField"));
 
-        for
-        (
-            IOobjectList::iterator vectorFieldIter = vectorFields.begin();
-            vectorFieldIter != vectorFields.end();
-            ++vectorFieldIter
-        )
+        forAllIter(IOobjectList, vectorFields, iter)
         {
             // Read field
-            volVectorField field
+            volVectorField field(*iter(), mesh);
+
+            // lookup field from dictionary and convert field
+            label unitNumber;
+            if
             (
-                *vectorFieldIter(),
-                mesh
-            );
-
-            // lookup field from dictionary
-            if (foamDataToFluentDict.found(field.name()))
+                foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
+             && unitNumber > 0
+            )
             {
-                label unitNumber
-                (
-                    readLabel(foamDataToFluentDict.lookup(field.name()))
-                );
-
-                // Convert field
-                if (unitNumber > 0)
-                {
-                    Info<< "    Converting field " << field.name() << endl;
-                    writeFluentField(field, unitNumber, fluentDataFile);
-                }
+                Info<< "    Converting field " << field.name() << endl;
+                writeFluentField(field, unitNumber, fluentDataFile);
             }
         }
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 124bab1411..a49c4e188e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -22,11 +22,11 @@ for (label i=0; i < nTypes; i++)
 
         if (fieldTypes[i] == "volScalarField")
         {
-            volScalarField gmvScalarField(fieldObject, mesh);
+            volScalarField fld(fieldObject, mesh);
             gmvFile << fieldName << " 0" << nl;
             for (label indx=0;indx<mesh.nCells();indx++)
             {
-                gmvFile << gmvScalarField[indx] << " ";
+                gmvFile << fld[indx] << " ";
             }
             gmvFile << nl;
         }
@@ -35,19 +35,19 @@ for (label i=0; i < nTypes; i++)
         {
             if (fieldName == vComp)
             {
-                volVectorField gmvVectorField(fieldObject, mesh);
+                volVectorField fld(fieldObject, mesh);
                 gmvFile << "velocity 0" << nl;
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].x() << " ";
+                    gmvFile << fld[indx].x() << " ";
                 }
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].y() << " ";
+                    gmvFile << fld[indx].y() << " ";
                 }
                 for (label indx=0;indx<mesh.nCells();indx++)
                 {
-                    gmvFile << gmvVectorField[indx].z() << " ";
+                    gmvFile << fld[indx].z() << " ";
                 }
                 gmvFile << nl;
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
index a99b94133e..3d7c4827a0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
@@ -1,42 +1,27 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << ' ';
 }
 gmvFile << nl;
 
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << ' ';
 }
 gmvFile << nl;
 
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << ' ';
 }
 gmvFile << nl;
 
 forAll(lagrangianScalarNames, i)
 {
-    word name = lagrangianScalarNames[i];
+    const word& name = lagrangianScalarNames[i];
 
-    IOField<scalar> s
+    IOField<scalar> fld
     (
         IOobject
         (
@@ -49,13 +34,13 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size())
+    if (fld.size())
     {
         gmvFile << name  << nl;
 
-        for (label n = 0; n < s.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << s[n] << token::SPACE;
+            gmvFile << fld[n] << token::SPACE;
         }
         gmvFile << nl;
     }
@@ -65,9 +50,9 @@ forAll(lagrangianScalarNames, i)
 
 forAll(lagrangianVectorNames, i)
 {
-    word name = lagrangianVectorNames[i];
+    const word& name = lagrangianVectorNames[i];
 
-    IOField<vector> v
+    IOField<vector> fld
     (
         IOobject
         (
@@ -80,29 +65,29 @@ forAll(lagrangianVectorNames, i)
         )
     );
 
-    if (v.size())
+    if (fld.size())
     {
         gmvFile << name + "x" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].x() << token::SPACE;
+            gmvFile << fld[n].x() << token::SPACE;
         }
         gmvFile << nl;
 
         gmvFile << name + "y" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].y() << token::SPACE;
+            gmvFile << fld[n].y() << token::SPACE;
         }
         gmvFile << nl;
 
         gmvFile << name + "z" << nl;
 
-        for (label n = 0; n < v.size(); n++)
+        forAll(fld, n)
         {
-            gmvFile << v[n].z() << token::SPACE;
+            gmvFile << fld[n].z() << token::SPACE;
         }
         gmvFile << nl;
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
index 196169f894..ad46f67109 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
@@ -1,81 +1,48 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << " ";
 }
 gmvFile << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << " ";
 }
 gmvFile << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "U" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().x() << " ";
+    gmvFile << iter().velocity().x() << " ";
 }
 gmvFile << nl;
+
 gmvFile << "V" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().y() << " ";
+    gmvFile << iter().velocity().y() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "W" << nl;
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().velocity().z() << " ";
+{
+    gmvFile << iter().velocity().z() << " ";
 }
 gmvFile << nl;
 
 gmvFile << "Diam" << nl;
-
-for
-(
-    discretePhase::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(discretePhase, particles, iter)
 {
-    gmvFile << elmnt().d() << " ";
+    gmvFile << iter().d() << " ";
 }
 
-
 gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
index 3c4f629235..725bf836aa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
@@ -1,32 +1,19 @@
 gmvFile << "tracers " << particles.size() << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().x() << " ";
+    gmvFile << iter().position().x() << " ";
 }
 gmvFile << nl;
-for
-(
-    Cloud<passiveParticle>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().y() << " ";
+    gmvFile << iter().position().y() << " ";
 }
 gmvFile << nl;
-for
-(
-    Cloud<passiveParticles>::iterator elmnt = particles.begin();
-    elmnt != particles.end();
-    ++elmnt
-)
+
+forAllConstIter(Cloud<passiveParticle>, particles, iter)
 {
-    gmvFile << elmnt().position().z() << " ";
+    gmvFile << iter().position().z() << " ";
 }
 gmvFile << nl;
 
@@ -51,15 +38,13 @@ forAll(lagrangianScalarNames, i)
     {
         gmvFile << name  << nl;
 
-        for (label n = 0; n < s.size(); n++)
+        forAll(s, n)
         {
             gmvFile << s[n] << token::SPACE;
         }
         gmvFile << nl;
     }
 
-
 }
 
-
 gmvFile << "endtrace"<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
index 4afa84809b..e649658d19 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
@@ -1,2 +1,3 @@
-gmvFile << "probtime  " << runTime.timeName() << nl;
-gmvFile << "endgmv" << nl;
+gmvFile
+    << "probtime  " << runTime.timeName() << nl
+    << "endgmv" << nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
index 35f30932b4..c1a0cd7c78 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
@@ -26,13 +26,14 @@ word format
     conversionProperties.lookup("format")
 );
 
-if ( (format != "ascii") && (format != "ieeei4r8") )
+if ((format != "ascii") && (format != "ieeei4r8"))
 {
     FatalError << "format type: " << format << " unknown."
         << " Valid options are: ascii ieeei4r8"
         << abort(FatalError);
 
 }
+
 word cells
 (
     conversionProperties.lookup("cells")
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
index 238c421b9a..6f66553f18 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
@@ -50,12 +50,7 @@ void readFields
     label nFields = fields.size();
     fields.setSize(nFields + fieldObjects.size());
 
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 4d9453f2fe..d626249dcf 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -50,12 +50,7 @@ void readFields
     fields.setSize(fieldObjects.size());
     label nFields = 0;
 
-    for
-    (
-        IOobjectList::iterator iter = fieldObjects.begin();
-        iter != fieldObjects.end();
-        ++iter
-    )
+    forAllIter(IOobjectList, fieldObjects, iter)
     {
         if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
index e5b9e61b15..a1a19b90a6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
@@ -27,14 +27,9 @@ License
 #include "OFstream.H"
 #include "writeFuns.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void writeFaceSet
+void Foam::writeFaceSet
 (
     const bool binary,
     const vtkMesh& vMesh,
@@ -73,12 +68,7 @@ void writeFaceSet
     labelList setFaceLabels(set.size());
     label setFaceI = 0;
 
-    for
-    (
-        faceSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, set, iter)
     {
         setFaceLabels[setFaceI] = iter.key();
         setFaces[setFaceI] = faces[iter.key()];
@@ -139,8 +129,5 @@ void writeFaceSet
     writeFuns::write(pStream, binary, setFaceLabels);
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
index 99ffed64e8..b286aea477 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
@@ -187,7 +187,6 @@ protected:
     );
 
     //- Get the mesh/fields for a particular time
-    //- Destructor
     virtual int RequestData
     (
         vtkInformation*,
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index bf47155085..7b874029d6 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -693,8 +693,7 @@ public:
 
 
     //- Destructor
-
-        ~vtkPV3Foam();
+    ~vtkPV3Foam();
 
 
     // Member Functions
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
index 1c0322a425..aac26fdd35 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
@@ -312,8 +312,7 @@ public:
 
 
     //- Destructor
-
-        ~vtkPV3blockMesh();
+    ~vtkPV3blockMesh();
 
 
     // Member Functions
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
index 68ebbf768e..de8c90d7ae 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
@@ -47,19 +47,13 @@ int USERD_get_part_coords
     }
     else if (part_number == nPatches+2)
     {
-
         label indx = 1;
 
-        for
-        (
-            Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
-            elmnt != sprayPtr->end();
-            ++elmnt
-        )
+        forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
         {
-            coord_array[0][indx] = (float)elmnt().position().x();
-            coord_array[1][indx] = (float)elmnt().position().y();
-            coord_array[2][indx] = (float)elmnt().position().z();
+            coord_array[0][indx] = (float)iter().position().x();
+            coord_array[1][indx] = (float)iter().position().y();
+            coord_array[2][indx] = (float)iter().position().z();
             indx++;
         }
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
index c05af41ccd..b270a1b57b 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
@@ -17,7 +17,7 @@ int USERD_get_part_node_ids
             nodeid_array[indx] = indx + 1;
         }
     }
-    else if  (part_number < nPatches+2)
+    else if (part_number < nPatches+2)
     {
 
         label patchi = part_number-2;
@@ -32,18 +32,14 @@ int USERD_get_part_node_ids
         }
 
     }
-    else if  (part_number == nPatches+2)
+    else if (part_number == nPatches+2)
     {
         label indx = 0;
-        for
-        (
-            Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
-            elmnt != sprayPtr->end();
-            ++elmnt
-        )
+
+        forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
         {
-             nodeid_array[indx] = indx + 1;
-             indx++;
+            nodeid_array[indx] = indx + 1;
+            indx++;
         }
     }
     else
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
index da0e634839..211c78b39e 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
@@ -116,9 +116,8 @@ public:
         readerDatabase();
 
 
-    // Destructor
-
-        ~readerDatabase();
+    //- Destructor
+    ~readerDatabase();
 
 
     // Member Functions
diff --git a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
index e18a7d55c3..fd8d4163df 100644
--- a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
@@ -52,12 +52,7 @@ void MapConsistentVolFields
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllIter(IOobjectList, fields, fieldIter)
     {
         Info<< "    interpolating " << fieldIter()->name()
             << endl;
diff --git a/applications/utilities/preProcessing/mapFields/MapVolFields.H b/applications/utilities/preProcessing/mapFields/MapVolFields.H
index c8b360f98f..7bc16c3c4e 100644
--- a/applications/utilities/preProcessing/mapFields/MapVolFields.H
+++ b/applications/utilities/preProcessing/mapFields/MapVolFields.H
@@ -52,12 +52,7 @@ void MapVolFields
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllIter(IOobjectList, fields, fieldIter)
     {
         IOobject fieldTargetIOobject
         (
diff --git a/applications/utilities/preProcessing/mapFields/UnMapped.H b/applications/utilities/preProcessing/mapFields/UnMapped.H
index bd480e4cfa..8e5ee42792 100644
--- a/applications/utilities/preProcessing/mapFields/UnMapped.H
+++ b/applications/utilities/preProcessing/mapFields/UnMapped.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,12 +39,7 @@ void UnMapped(const IOobjectList& objects)
 {
     IOobjectList fields = objects.lookupClass(Type::typeName);
 
-    for
-    (
-        IOobjectList::iterator fieldIter = fields.begin();
-        fieldIter != fields.end();
-        ++fieldIter
-    )
+    forAllConstIter(IOobjectList, fields, fieldIter)
     {
         mvBak(fieldIter()->objectPath(), "unmapped");
     }
diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
index 2d58fcd313..ce32c54206 100644
--- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
+++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
@@ -126,18 +126,13 @@ void dumpFaces
 
     OFstream os(fName);
 
-    for
-    (
-        Map<label>::const_iterator iter = connectedFaces.begin();
-        iter != connectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, connectedFaces, iter)
     {
         const labelledTri& f = surf.localFaces()[iter.key()];
 
         point ctr(f.centre(surf.localPoints()));
 
-        os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
+        os  << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
     }
 }
 
@@ -502,14 +497,9 @@ void calcPointVecs
 
     boolList edgeDone(surf.nEdges(), false);
 
-    for
-    (
-        Map<label>::const_iterator iter = faceToEdge.begin();
-        iter != faceToEdge.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, faceToEdge, iter)
     {
-        label edgeI = iter();
+        const label edgeI = iter();
 
         if (!edgeDone[edgeI])
         {
@@ -610,15 +600,9 @@ void renumberFaces
     List<labelledTri>& newTris
 )
 {
-    for
-    (
-        Map<label>::const_iterator iter = faceToEdge.begin();
-        iter != faceToEdge.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, faceToEdge, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const labelledTri& f = surf.localFaces()[faceI];
 
         forAll(f, fp)
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index 2a791d3bb4..c9c02d199b 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
 {
 
 #   include "setRootCase.H"
-
 #   include "createTime.H"
 
     Info<< nl << "Reading Burcat data IOdictionary" << endl;
@@ -119,17 +118,11 @@ int main(int argc, char *argv[])
     );
 
 
-    for
-    (
-        SLPtrList<thermo>::iterator EQreactionsIter = EQreactions.begin();
-        EQreactionsIter != EQreactions.end();
-        ++EQreactionsIter
-    )
+    forAllConstIter(SLPtrList<thermo>, EQreactions, iter)
     {
-        Info<< "Kc(EQreactions) = " << EQreactionsIter().Kc(T) << endl;
+        Info<< "Kc(EQreactions) = " << iter().Kc(T) << endl;
     }
 
-
     Info<< nl << "end" << endl;
 
     return 0;
diff --git a/bin/foamCopySettings b/bin/foamCopySettings
index cfa9d901e4..9e1969c96b 100755
--- a/bin/foamCopySettings
+++ b/bin/foamCopySettings
@@ -37,9 +37,12 @@
 #     to add any custom rsync options.
 #-------------------------------------------------------------------------------
 Script=${0##*/}
-if [ "$1" = "-h" -o "$1" = "-help" -o "$#" -ne 2 ]
-then
+
+#------------------------------------------------------------------------------
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done
     cat <<USAGE 1>&2
+
 Usage: $Script srcDir dstDir
 
     Copy OpenFOAM settings from one case to another, without copying
@@ -52,7 +55,29 @@ Note
 
 USAGE
     exit 1
-fi
+}
+#------------------------------------------------------------------------------
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+# need rsync
+type rsync >/dev/null 2>&1 || usage "Error: 'rsync' seems to be missing"
+
+[ "$#" -eq 2 ] || usage "Error: incorrect number of arguments"
 
 srcDir=${1%/}
 dstDir=${2%/}
diff --git a/bin/foamEndJob b/bin/foamEndJob
index 1c6b1c9438..b934d5addd 100755
--- a/bin/foamEndJob
+++ b/bin/foamEndJob
@@ -35,8 +35,94 @@
 #       to restore controlDict
 #
 #-------------------------------------------------------------------------------
+Script=${0##*/}
 
-PROGNAME=`basename $0`
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: $Script [OPTION] <pid>
+Usage: $Script [OPTION] -c
+
+options:
+  -clear            use blockMesh reader  (uses .blockMesh extension)
+  -case <dir>       specify alternative case directory, default is the cwd
+  -now              stop at next time step
+  -help             print the usage
+
+Tries to end running OpenFOAM application at next write (or optionally
+at the next time step). It needs runTimeModifiable switched on in the
+controlDict. It changes stopAt in the controlDict and waits for the
+job to finish. Restores original controlDict if
+
+    - job has finished
+    - controlDict gets modified (by user)
+    - $Script gets killed.
+
+The -clear option clears any outstanding $Script for the case.
+
+USAGE
+    exit 1
+}
+
+unset clearOpt stopOpt
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -case)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        cd "$2" 2>/dev/null || usage "directory does not exist:  '$2'"
+        shift 2
+        ;;
+    -c | -clear)
+        clearOpt=true
+        shift
+        ;;
+    -n | -now)
+        stopOpt=now
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+# parent directory for normal or parallel
+case "$PWD" in
+    processor*) caseDir=".." ;;
+    *)          caseDir="."  ;;
+esac
+
+# check that case directory is writeable
+[ -w $caseDir ] || {
+    echo "$Script : $caseDir is not writeable"
+    exit 1
+}
+
+# check that controlDict is writeable
+controlDict=$caseDir/system/controlDict
+[ -w $controlDict ] || {
+    echo "$Script : $controlDict is not writeable"
+    exit 1
+}
+
+# need a pid unless with the -clear option
+if [ "$clearOpt" = true ]
+then
+    [ $# -eq 0 ] || usage
+else
+    [ $# -eq 1 ] || usage
+    PID=$1
+fi
 
 
 #-------------------------------------------------------------------------------
@@ -54,7 +140,7 @@ getNumberedLine() {
 # getLine dictionary entry
 # Prints dictionary entry line (without lineno)
 getLine() {
-    getNumberedLine $1 "$2" | sed -e 's/^[^:]*://' 
+    getNumberedLine $1 "$2" | sed -e 's/^[^:]*://'
 }
 
 # getRawEntry dictionary entry
@@ -66,7 +152,7 @@ getRawEntry() {
 # getEntry dictionary entry
 # Like getRawEntry but strips " and ending ';'
 getEntry() {
-    getRawEntry $1 "$2" | sed -e 's/^"//'  -e 's/;$//' -e 's/"$//' 
+    getRawEntry $1 "$2" | sed -e 's/^"//'  -e 's/;$//' -e 's/"$//'
 }
 
 # getKey entryLine
@@ -77,13 +163,14 @@ getKey() {
 
 
 # setRawEntry dictionary entry newValue
-# Replaces value of entry 
+# Replaces value of entry
 setRawEntry() {
     oldNumLine=`getNumberedLine $1 "$2"`
     lineNo=`echo "$oldNumLine" | sed -e 's/:.*//'`
     oldLine=`echo "$oldNumLine" | sed -e 's/^[^:]*://'`
     oldKey=`getKey "$oldLine"`
     oldVal=`getRawEntry $1 "$2"`
+
     if [ ! "$oldKey" -o ! "$oldVal" -o ! "$oldLine" ]
     then
         echo "setRawStringEntry: entry $2 not found in $1"
@@ -92,6 +179,7 @@ setRawEntry() {
         echo "oldLine=$oldLine"
         exit 1
     fi
+
     #echo "oldKey=$oldKey"
     #echo "lineNo=$lineNo"
     #echo "oldLine=$oldLine"
@@ -108,76 +196,30 @@ getBoolEntry()
 {
     val=`getEntry $1 $2`
     case "$val" in
-      'yes')
+    y | yes | true | on | 1)
         return 0
         ;;
-      'no')
+    n | no | false | off | 0)
         return 123
         ;;
-      'true')
-        return 0
-        ;;
-      'false')
-        return 123
-        ;;
-      1)
-        return 0
-        ;;
-      0)
-        return 123
-        ;;
-      *)
-        echo "$PROGNAME : getBoolEntry : Illegal boolean value $val in dictionary $1"
+    *)
+        echo "$Script : getBoolEntry : Illegal boolean value $val in dictionary $1"
         exit 1
         ;;
     esac
 }
 
-# newerFile file1 file2
-# ... could also use   if [ $file1 -nt $file2 ] ...
-newerFile()
-{
-    latest=`ls -1 -t $1 $2 2> /dev/null | head -1`
-    if [ "$latest" = $1 ]
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
 # processExists pid
 # Returns true if pid exists.
 processExists() {
-    ps -u $LOGNAME -o 'pid' | fgrep $1 >/dev/null
+    ps -u $LOGNAME -o pid | fgrep $1 >/dev/null
 }
 
-usage() {
-cat << USAGE
-Usage: $PROGNAME [-n] <root> <case> <pid>
-          or
-       $PROGNAME -c <root> <case>
-
-Tries to end running Foam application at next write or at next time
-step (-n (at your option). It needs runTimeModifiable switched on in the
-controlDict. It changes stopAt in the controlDict and waits for the job to
-finish. Restores original controlDict if
-    - job has finished
-    - controlDict gets modified (by user)
-    - $PROGNAME gets killed.
-
-The -c option clears any outstanding $PROGNAME for the case.
-
-USAGE
-    exit 1
-}
-
-
 # Restore controlDict and clean up
 restoreDict() {
-    trap 2 3 15
+    trap QUIT TERM INT
 
-    echo "$PROGNAME : Restoring controlDict from controlDict_bak."
+    echo "$Script : Restoring controlDict from controlDict_bak"
     if [ -r ${controlDict}_bak ]
     then
         cp ${controlDict}_bak $controlDict
@@ -185,7 +227,7 @@ restoreDict() {
 
     rm -f $pidFile
 
-    echo "$PROGNAME : Exiting."
+    echo "$Script : Exiting"
     exit 0
 }
 
@@ -196,105 +238,51 @@ restoreDict() {
 #
 #-------------------------------------------------------------------------------
 
-ARCH=`uname -s`
-
 #-- Force standards behaving ps
 #   Get info on all $USER processes
-case $ARCH in
-  HP-UX*)
-    UNIX95=a; export UNIX95
+case `uname -s` in
+HP-UX*)
+    UNIX95=a
+    export UNIX95
     ;;
-  IRIX*)
-    _XPG=1; export _XPG
+IRIX*)
+    _XPG=1
+    export _XPG
     ;;
 esac
 
 
-#
-# Initial checks
-#
-if [ $# -lt 3 ]
-then
-    usage
-fi
-
-STOPNOW=''
-if [ $1 = '-n' ]
-then
-    STOPNOW='yes'
-    shift
-fi
-CLEAR=''
-if [ $1 = '-c' ]
-then
-    CLEAR='yes'
-    shift
-    if [ $# -ne 2 ]
-    then
-        usage
-    fi
-    ROOT=$1
-    CASE=$2
-else
-    if [ $# -ne 3 ]
-    then
-        usage
-    fi
-    ROOT=$1
-    CASE=$2
-    PID=$3
-fi
-CASE=`echo $CASE | sed -e 's!/.*!!'`       # strip of processorXXX ending
-
-#- Pid actually running
-if [ ! "$CLEAR" ]
+# Pid actually running
+if [ "$clearOpt" != true ]
 then
     processExists $PID
     if [ $? -ne 0 ]
     then
-        echo "$PROGNAME : process $PID not running."
+        echo "$Script : process $PID not running"
         exit 1
     fi
 fi
 
-#- case directory writeable
-if [ ! -w $ROOT/$CASE ]
-then
-    echo "$PROGNAME : $ROOT/$CASE is not writeable."
-    exit 1
-fi
-
-#- Controldict writeable
-controlDict=$ROOT/$CASE/system/controlDict
-if [ ! -w  $controlDict ]
-then
-    echo "$PROGNAME : $controlDict is not writeable."
-    exit 1
-fi
-
 #- runTimeModifiable
-getBoolEntry $controlDict 'runTimeModifiable'
-if [ $? -ne 0 ]
-then
-    echo "$PROGNAME : runTimeModifiable not true in dictionary $controlDict."
+getBoolEntry $controlDict runTimeModifiable || {
+    echo "$Script : runTimeModifiable not true in dictionary $controlDict"
     exit 1
-fi
+}
 
 #
 #- Check if another foamEndJob running
 #
-if [ "$CLEAR" ]
+if [ "$clear" = true ]
 then
-    pidFiles=`ls $ROOT/$CASE/.foamEndJob* 2>/dev/null`
+    pidFiles=`ls $caseDir/.foamEndJob* 2>/dev/null`
     for pidFile in $pidFiles
     do
         pid=`cat $pidFile`
         if [ "$pid" ]
         then
-            echo "$PROGNAME : found $PROGNAME (pid $pid) for Foam process"
-            echo "  root: $ROOT"
-            echo "  case: $CASE"
-            echo "$PROGNAME : Killing $PROGNAME (pid $pid)."
+            echo "$Script : found $Script (pid $pid) for OpenFOAM process"
+            echo "  case: $PWD/$caseDir"
+            echo "$Script : Killing $Script (pid $pid)"
             kill $pid
             rm -f $pidFile
         fi
@@ -302,7 +290,7 @@ then
     exit 0
 fi
 
-pidFile=$ROOT/$CASE/.foamEndJob${PID}
+pidFile=$caseDir/.foamEndJob$PID
 if [ -f $pidFile ]
 then
     pid=`cat $pidFile`
@@ -311,12 +299,11 @@ then
         processExists $pid
         if [ $? -eq 0 ]
         then
-            echo "$PROGNAME : found running $PROGNAME (pid $pid) for Foam process"
-            echo "  root: $ROOT"
-            echo "  case: $CASE"
+            echo "$Script : found running $Script (pid $pid) for OpenFOAM process"
+            echo "  case: $PWD/$caseDir"
             echo "  pid : $PID"
             echo "  lock: $pidFile"
-            echo "Remove the lock if this is not the case."
+            echo "Remove the lock if this is not the case"
             exit 1
         fi
     fi
@@ -331,63 +318,60 @@ echo $$ > $pidFile
 
 
 #- startTime
-startTime=`getEntry $controlDict 'startTime'`
-if [ ! "$startTime" ]
-then
-    echo "$PROGNAME : startTime not set in dictionary $controlDict."
+startTime=`getEntry $controlDict startTime`
+[ "$startTime" ] || {
+    echo "$Script : startTime not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- Write interval
-writeInterval=`getEntry $controlDict 'writeInterval'`
-if [ ! "$writeInterval" ]
-then
-    echo "$PROGNAME : writeInterval not set in dictionary $controlDict."
+writeInterval=`getEntry $controlDict writeInterval`
+[ "$writeInterval" ] || {
+    echo "$Script : writeInterval not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- stopAt
-stopAt=`getEntry $controlDict 'stopAt'`
-if [ ! "$stopAt" ]
-then
-    echo "$PROGNAME : stopAt not set in dictionary $controlDict."
+stopAt=`getEntry $controlDict stopAt`
+[ "$stopAt" ] || {
+    echo "$Script : stopAt not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 #- endTime
-endTime=`getEntry $controlDict 'endTime'`
-if [ ! "$endTime" ]
-then
-    echo "$PROGNAME : endTime not set in dictionary $controlDict."
+endTime=`getEntry $controlDict endTime`
+[ "$endTime" ] || {
+    echo "$Script : endTime not set in dictionary $controlDict"
     exit 1
-fi
+}
 
 
-echo "$PROGNAME : Read from controlDict:"
+echo "$Script : Read from controlDict:"
 echo "  controlDict   : $controlDict"
 echo "  writeInterval : $writeInterval"
 #echo "  startTime     : $startTime"
 echo "  stopAt        : $stopAt"
 #echo "  endTime       : $endTime"
 
-echo "$PROGNAME : Making backup of controlDict to controlDict_bak"
+echo "$Script : Making backup of controlDict to controlDict_bak"
 cp $controlDict ${controlDict}_bak
+
 #- Set up handler to restore controlDict
-trap restoreDict 2 3 15
+trap restoreDict QUIT TERM INT
 
-if [ "$STOPNOW" ]
+if [ "$stopOpt" = now ]
 then
-    setRawEntry  $controlDict 'stopAt' 'nextWrite'
-    setRawEntry  $controlDict 'writeInterval' '1'
+    setRawEntry  $controlDict stopAt nextWrite
+    setRawEntry  $controlDict writeInterval 1
 
-    echo "$PROGNAME : Changed in controlDict:"
-    echo "    `getLine $controlDict 'stopAt'`"
-    echo "    `getLine $controlDict 'writeInterval'`"
+    echo "$Script : Changed in controlDict:"
+    echo "    `getLine $controlDict stopAt`"
+    echo "    `getLine $controlDict writeInterval`"
 else
-    setRawEntry $controlDict 'stopAt' 'nextWrite'
+    setRawEntry $controlDict stopAt nextWrite
 
-    echo "$PROGNAME : Changed in controlDict:"
-    echo "    `getLine $controlDict 'stopAt'`"
+    echo "$Script : Changed in controlDict:"
+    echo "    `getLine $controlDict stopAt`"
 fi
 
 
@@ -401,23 +385,24 @@ sleep 5
 touch ${controlDict}_bak
 
 #- Loop a while to give NFS time to update
-if newerFile ${controlDict} ${controlDict}_bak; then
-    echo "$PROGNAME : controlDict newer than controlDict_bak."
-    echo "$PROGNAME : Waiting for file dates to get updated."
+if [ ${controlDict} -nt ${controlDict}_bak ]
+then
+    echo "$Script : controlDict newer than controlDict_bak"
+    echo "$Script : Waiting for file dates to get updated"
 
     iter=0
-    while newerFile ${controlDict} ${controlDict}_bak
+    while [ ${controlDict} -nt ${controlDict}_bak ]
     do
         if [ $iter -ge 120 ]
         then
             #- 120*5 sec = 10 mins passed. Give up
-            echo "$PROGNAME : File date not yet ok after 10 mins. Giving up."
+            echo "$Script : File date not yet ok after 10 mins ... giving up"
             break
         fi
         #- Give _bak a later time
         touch ${controlDict}_bak
 
-        #- Give nfs some time to update time on controlDict.
+        #- Give NFS a chance to update time on controlDict.
         sleep 5
 
         iter=`expr $iter + 1`
@@ -430,21 +415,20 @@ fi
 #  - controlDict modified. No restore.
 #  - controlDict_bak removed. No restore.
 
-echo "$PROGNAME : Waiting for Foam job $PID to finish ..."
+echo "$Script : Waiting for OpenFOAM job $PID to finish ..."
 
 while true
 do
     sleep 5
 
-    if [ ! -r ${controlDict}_bak ]
-    then
-        echo "$PROGNAME : ${controlDict}_bak dissappeared. Exiting without restore."
+    [ -r ${controlDict}_bak ] || {
+        echo "$Script : ${controlDict}_bak disappeared. Exiting without restore"
         exit 1
-    fi
+    }
 
-    if newerFile ${controlDict} ${controlDict}_bak
+    if [ ${controlDict} -nt ${controlDict}_bak ]
     then
-        echo "$PROGNAME : ${controlDict} modified externally. Exiting without restore."
+        echo "$Script : ${controlDict} modified externally. Exiting without restore"
         exit 0
     fi
 
@@ -454,7 +438,7 @@ do
         #- Job finished
         break
     fi
-    # echo "Foam job $PID still running ..."
+    # echo "OpenFOAM job $PID still running ..."
 done
 
 #- Dictionary restore
diff --git a/bin/foamLog b/bin/foamLog
index a5d2ecf254..e0e316784d 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -31,35 +31,36 @@
 # Bugs
 #     -solution singularity not handled
 #------------------------------------------------------------------------------
+Script=${0##*/}
+toolsDir=${0%/*}/tools
 
-PROGDIR=`dirname $0`
-PROGNAME=`basename $0`
-DBFILE=${PROGNAME}.db
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat <<USAGE
 
-printUsage() {
-cat <<USAGE
-$PROGNAME - extracts xy files from OpenFOAM logs.
+Usage: $Script [OPTIONS] <log>
+  -list             lists but does not extract
+  -n                create single column files with the extracted data only
+  -quiet            quiet operation
+  -help             print the usage
 
-Usage: $PROGNAME [-n][-s] <log>
-           extracts xy files from log
-       $PROGNAME -l <log>
-           lists but does not extract
-       $PROGNAME -h
-           for a help message
+$Script - extracts xy files from OpenFOAM logs.
 
 USAGE
+    exit 1
 }
 
+#------------------------------------------------------------------------------
 
 printHelp() {
-printUsage
-cat <<LABHELP
+cat <<HELP
+-----------------------------------------------------------------------------
 The default is to extract for all the 'Solved for' variables the initial
 residual, the final residual and the number of iterations. Additionally, a
 (user editable) database is used to extract data for standard non-solved for
 variables like Courant number, and execution time.
 
-$PROGNAME -l lists all the possible variables without extracting them.
+$Script -l lists all the possible variables without extracting them.
 
 The program will generate and run an awk script which writes a set of files,
 logs/<var>_<subIter>, for every <var> specified, for every occurrence inside
@@ -79,7 +80,7 @@ separated with '/' :
   Column 2 is the extended regular expression (egrep) to select the line.
   Column 3 is the string (fgrep) to select the column inside the line.
 The value taken will be the first (non-space)word after this column.
-The database ($PROGNAME.db) will taken from these locations:
+The database ($Script.db) will taken from these locations:
 
     .
     $HOME/.OpenFOAM/$WM_PROJECT_VERSION
@@ -87,61 +88,97 @@ The database ($PROGNAME.db) will taken from these locations:
     $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION
     $WM_PROJECT_INST_DIR/site
     $WM_PROJECT_DIR/etc
-    $PROGDIR/tools
+    $toolsDir
 
-Option -s suppresses the default information and only prints the extracted
+Option -q suppresses the default information and only prints the extracted
 variables.
+-----------------------------------------------------------------------------
+HELP
 
-LABHELP
+usage
 }
 
 
-# The various places to be searched:
-for i in \
-    . \
-    $HOME/.OpenFOAM/$WM_PROJECT_VERSION \
-    $HOME/.OpenFOAM \
-    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \
-    $WM_PROJECT_INST_DIR/site \
-    $WM_PROJECT_DIR/etc \
-    $PROGDIR/tools \
-    ;
+timeName=Time
+unset listOpt quietOpt
+
+# parse options
+while [ "$#" -gt 0 ]
 do
-    if [ -r $i/$DBFILE ]
-    then
-        DBFILE="$i/$DBFILE"
+    case "$1" in
+    -h | -help)
+        printHelp
+        exit 0
+        ;;
+    -n)
+        unset timeName
+        shift
+        ;;
+    -l | -list)
+        listOpt=true
+        shift
+        ;;
+    -q | -quiet | -s | -silent)
+        quietOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
         break
-    fi
+        ;;
+    esac
 done
 
+# find the database file
+DBFILE=$Script.db
+[ -f $DBFILE ] || DBFILE=`foamEtcFile $Script.db` || DBFILE=$toolsDir/$Script.db
 
-myEcho() {
-  if [ "$VERBOSE" ]
-  then
-      echo "$*"
-  fi
+# need the database file
+[ -f $DBFILE ] || {
+    echo "$Script: Cannot read database $DBFILE"
+    exit 1
 }
 
+# single logFile
+if [ $# -eq 1 ]
+then
+    LOG=$1
+    [ -r "$LOG" ] && [ -f "$LOG" ] || usage "Cannot read log $LOG"
+else
+    usage
+fi
+
+
+myEcho()
+{
+   [ "$quietOpt" = true ] || echo "$*"
+}
+
+
 # getSolvedVars logFile
 # Prints names of all 'solved for' variables in the log file.
-getSolvedVars() {
+getSolvedVars()
+{
     fgrep ' Solving for ' $1 | fgrep ',' | sed -e 's/.* Solving for \([^,]*\)[,:].*/\1/' | sort -u
 }
 
 
 # getQueries dbFile queryName
 # Gets regular expressions for a certain queryName from the database
-getQueries() {
-    if [ ! -f "$1" ]
-    then
-        echo "Cannot find dbFile $1"
-        exit 1
-    fi
-
+getQueries()
+{
+    dbFile=$1
     queryName=$2
 
-    LINEQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'`
-    NUMQ=`grep -v '^#' $1 | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'`
+    [ -f "$dbFile" ] || {
+        echo "Cannot find dbFile $dbFile"
+        exit 1
+    }
+
+    LINEQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $2}'`
+    NUMQ=`grep -v '^#' $dbFile | awk -F '/' "/$queryName/ {if (\"$queryName\" "'!= $1) next; print $3}'`
 
     #echo "For $queryName found line selection /$LINEQ/ , column selection /$NUMQ/" 1>&2
     #if [ ! "$LINEQ" -o ! "$NUMQ" ]
@@ -153,14 +190,16 @@ getQueries() {
 
 # getDbQueryList dbFile
 # Echoes list of possible queries
-getDbQueryList() {
+getDbQueryList()
+{
     grep -v '^#' $1 | grep '[^ \t]' | awk -F '/' '{print $1}'
 }
 
 
 # getSolveQueryList logFile
 # Echoes list of queries from "solved for" variables in log file
-getSolveQueryList() {
+getSolveQueryList()
+{
     solvedVars=`getSolvedVars $1`
 
     for var in $solvedVars
@@ -174,7 +213,8 @@ getSolveQueryList() {
 
 # getAllQueries dbFile logFile
 # Gets all queries from database and from logfile
-getAllQueries() {
+getAllQueries()
+{
     #-- All solved for queries from log file
     queries=`getSolveQueryList $2`
 
@@ -208,107 +248,33 @@ getAllQueries() {
 # Main
 #-----------------------------
 
-# sort arguments
-TIMENAME='Time'
-VERBOSE='yes'
-LISTONLY=''
-
-while getopts nslh flags
-do
-    case $flags in
-    n)
-        TIMENAME=""
-        ;;
-    h)
-        printHelp
-        exit 0
-        ;;
-    s)
-        VERBOSE=""
-        ;;
-    l)
-        LISTONLY='yes'
-        ;;
-    \?)
-        printUsage
-        exit 1
-        ;;
-    esac
-done
-
-
-# Shift options
-shift `expr $OPTIND - 1`
-
-if [ ! -f $DBFILE ]
+if [ "$listOpt" = true ]
 then
-    echo "$PROGNAME: Cannot read database $DBFILE"
-    exit 1
-fi
-
-if [ "$LISTONLY" ]
-then
-    if [ $# -ne 1 ]
-    then
-        printUsage
-        exit 1
-    fi
-    LOG=$1;
-    if [ ! -r $LOG ]
-    then
-        echo "$PROGNAME: Cannot read log $LOG"
-        exit 1
-    fi
     getAllQueries $DBFILE $LOG
     exit 0
 fi
 
-if [ $# -ne 1 ]
-then
-    printUsage
-    exit 1
-fi
+caseDir=.
+outputDir=$caseDir/logs
 
-CASEDIR=.
-LOG=$1
-if [ ! -r $LOG ]
-then
-    echo "$PROGNAME: Cannot read log $LOG"
+[ -d "$caseDir" ] || {
+    echo "$Script: Cannot read $caseDir"
     exit 1
-fi
+}
 
 QUERYNAMES=`getAllQueries $DBFILE $LOG`
 
-
-if [ ! "$CASEDIR" ]
-then
-    printUsage
-    exit 1
-fi
-
-if [ ! -d "$CASEDIR" ]
-then
-    echo "$PROGNAME: Cannot read $CASEDIR"
-    exit 1
-fi
-
-if [ ! -f "$LOG" ]
-then
-    echo "$PROGNAME: Cannot read log file $LOG"
-    exit 1
-fi
-
-
-#-- Make logs dir in case directory and put awk file there.
-
-mkdir -p $CASEDIR/logs
-AWKFILE=$CASEDIR/logs/$PROGNAME.awk
+#
+# Make logs dir in case directory and place awk file there
+#
+mkdir -p $outputDir
+AWKFILE=$outputDir/$Script.awk
 
 myEcho "Using:"
 myEcho "  log      : $LOG"
 myEcho "  database : $DBFILE"
 myEcho "  awk file : $AWKFILE"
-myEcho "  files to : $CASEDIR/logs"
+myEcho "  files to : $outputDir"
 myEcho ""
 
 
@@ -316,22 +282,25 @@ myEcho ""
 # Generate Awk program
 #-----------------------------
 
-#-- header
+rm -f $AWKFILE 2> /dev/null
+cat << AWK_CONTENTS > $AWKFILE
+# header
+BEGIN {
+    Iteration=0
+    resetCounters()
+}
 
-rm -f $AWKFILE; touch $AWKFILE
-echo "BEGIN {" >> $AWKFILE
-echo "    Iteration=0" >> $AWKFILE
-echo "    resetCounters()" >> $AWKFILE
-echo "}" >> $AWKFILE
+# reset counters used for variable postfix
+function resetCounters() {
+AWK_CONTENTS
+# ----------
 
-echo "" >> $AWKFILE
-echo "# reset counters used for variable postfix" >> $AWKFILE
-echo "function resetCounters() {" >> $AWKFILE
 for queryName in $QUERYNAMES
 do
     varName=${queryName}Cnt
     echo "    ${varName}=0" >> $AWKFILE
 done
+
 echo "    # Reset counters for general Solving for extraction" >> $AWKFILE
 echo "    for (varName in subIter)" >> $AWKFILE
 echo "    {" >> $AWKFILE
@@ -341,10 +310,9 @@ echo "}" >> $AWKFILE
 echo "" >> $AWKFILE
 
 
-cat <<LABEL >> $AWKFILE
+cat << AWK_CONTENTS >> $AWKFILE
 # Extract value after columnSel
-function extract(inLine,columnSel,outVar,
-                 a,b)
+function extract(inLine,columnSel,outVar,a,b)
 {
     a=index(inLine, columnSel)
     b=length(columnSel)
@@ -352,71 +320,82 @@ function extract(inLine,columnSel,outVar,
     gsub("[,:]","",outVar[1])
 }
 
-LABEL
+AWK_CONTENTS
+# ----------
 
-
-#-- Generate code for iteration separator (increments 'Iteration')
+#
+# Code for iteration separator (increments 'Iteration')
+#
 getQueries $DBFILE 'Separator'
-cat <<LABSEP >> $AWKFILE
-#-- Iteration separator (increments 'Iteration')
+cat << AWK_CONTENTS >> $AWKFILE
+# Iteration separator (increments 'Iteration')
 /$LINEQ/ {
     Iteration++
     resetCounters()
 }
 
-LABSEP
+AWK_CONTENTS
+# ----------
 
-
-#-- Generate code for extracting Time
+#
+# Code for extracting Time
+#
 getQueries $DBFILE 'Time'
-cat <<LABTIME >> $AWKFILE
-#-- Time extraction (sets 'Time')
+cat << AWK_CONTENTS >> $AWKFILE
+# Time extraction (sets 'Time')
 /$LINEQ/ {
     extract(\$0, "$NUMQ", val)
     Time=val[1]
 }
 
-LABTIME
+AWK_CONTENTS
+# ----------
 
-
-#-- Generate code for singularity handling.
-cat <<LABSING >> $AWKFILE
-#-- Skip whole line with singularity variable
+#
+# Code for singularity handling.
+#
+cat << AWK_CONTENTS >> $AWKFILE
+# Skip whole line with singularity variable
 /solution singularity/ {
     next;
 }
-LABSING
 
+AWK_CONTENTS
+# ----------
 
-#-- Generate code for extracting solved for quantities
-cat <<LABSOLVE >> $AWKFILE
-#-- Extraction of any solved for variable
+#
+# Code for extracting solved for quantities
+#
+cat << AWK_CONTENTS >> $AWKFILE
+# Extraction of any solved for variable
 /Solving for/ {
     extract(\$0, "Solving for ", varNameVal)
 
     varName=varNameVal[1]
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "Initial residual = ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 
     varName=varNameVal[1] "FinalRes"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "Final residual = ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 
     varName=varNameVal[1] "Iters"
     file=varName "_" subIter[varName]++
-    file="$CASEDIR/logs/" file
+    file="$outputDir/" file
     extract(\$0, "No Iterations ", val)
-    print $TIMENAME "\t" val[1] > file
+    print $timeName "\t" val[1] > file
 }
 
-LABSOLVE
+AWK_CONTENTS
+# ----------
 
-
-#-- generate code to process queries
+#
+# Code to process queries
+#
 for queryName in $QUERYNAMES
 do
     getQueries $DBFILE $queryName
@@ -424,11 +403,11 @@ do
     then
         counter=${queryName}Cnt
 
-        echo "#-- Extraction of $queryName" >> $AWKFILE
+        echo "# Extraction of $queryName" >> $AWKFILE
         echo "/$LINEQ/ {" >> $AWKFILE
         echo "    extract(\$0, \"$NUMQ\", val)" >> $AWKFILE
-        echo "    file=\"$CASEDIR/logs/${queryName}_\" ${counter}" >> $AWKFILE
-        echo "    print $TIMENAME \"\\t\" val[1] > file" >> $AWKFILE
+        echo "    file=\"$outputDir/${queryName}_\" ${counter}" >> $AWKFILE
+        echo "    print $timeName \"\\t\" val[1] > file" >> $AWKFILE
         echo "    ${counter}++" >> $AWKFILE
         echo "}" >> $AWKFILE
         echo "" >> $AWKFILE
diff --git a/bin/foamNewCase b/bin/foamNewCase
index 6d83d5c5dd..52cd516bb6 100755
--- a/bin/foamNewCase
+++ b/bin/foamNewCase
@@ -55,7 +55,6 @@ USAGE
     exit 1
 }
 #------------------------------------------------------------------------------
-
 unset appName caseName listOpt
 
 # parse options
@@ -84,12 +83,19 @@ do
         version="$2"
         shift 2
         ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
     *)
-        usage "unknown option/argument: '$*'"
+        usage "unexpected argument: '$*'"
         ;;
     esac
 done
 
+# need rsync, except for when listing
+type rsync >/dev/null 2>&1 || [ "$listOpt" = true ] || usage "Error: 'rsync' seems to be missing"
+
+
 #------------------------------------------------------------------------------
 
 [ -n "$version" ] || {
diff --git a/bin/foamUpdateCaseFileHeader b/bin/foamUpdateCaseFileHeader
index c6fc291487..af9cafd649 100755
--- a/bin/foamUpdateCaseFileHeader
+++ b/bin/foamUpdateCaseFileHeader
@@ -32,41 +32,70 @@
 #     Also removes consecutive blank lines from file.
 #
 #------------------------------------------------------------------------------
-foamVersion=$WM_PROJECT_VERSION
-
 usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
 Usage: ${0##*/} [OPTION] <file1> ... <fileN>
 
 options:
-  -v VER  specifies the version to be written in the header
-  -h      help
+  -version <ver>    specifies the version to be written in the header
+  -help             print the usage
 
   Updates the header of application files and removes consecutive blank lines.
   By default, writes current OpenFOAM version in the header.
-  An alternative version can be specified with the -v option.
+  An alternative version can be specified with the -version option.
 
 USAGE
     exit 1
 }
 
+#------------------------------------------------------------------------------
 
-printHeader() {
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -v | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version="$2"
+        shift 2
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+# constant width for version - default to WM_PROJECT_VERSION
+version=$(printf %-36s ${version:-$WM_PROJECT_VERSION})
+
+[ $# -ge 1 ] || usage
+
+#------------------------------------------------------------------------------
+
+printHeader()
+{
     cat<<HEADER
 /*--------------------------------*- C++ -*----------------------------------*\\
 | =========                 |                                                 |
 | \\\\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\\\    /   O peration     | Version:  ${foamVersion}  |
+|  \\\\    /   O peration     | Version:  $version  |
 |   \\\\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\\\/     M anipulation  |                                                 |
 \\*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
-    format      ${1};
-    class       ${2};
-    object      ${3};
+    format      $1;
+    class       $2;
+    object      $3;
 }
 HEADER
 }
@@ -75,68 +104,40 @@ HEADER
 #
 # extract attribute '$1' from file '$2'
 #
-FoamFileAttribute() {
+FoamFileAttribute()
+{
     sed -n -e 's/[ ;]*$//' -e "s/^ *$1 *//p" $2
 }
 
 
 #
-# OPTIONS
+# main
 #
-opts=$(getopt hv: $*)
-if [ $? -ne 0 ]
-then
-    echo "Aborting due to invalid option"
-    usage
-fi
-eval set -- '$opts'
-while [ "$1" != "--" ]
-do
-    case $1 in
-    -v)
-        foamVersion=$2
-        shift
-        ;;
-    -h)
-        usage
-        ;;
-    esac
-    shift
-done
-shift
-
-[ $# -ge 1 ] || usage
-
-
-# constant width for version
-foamVersion=$(printf %-36s $foamVersion)
-
-#
-# MAIN
-#
-unset NOTE
 
+tmpFile=FoamFile.tmp$$
 for caseFile
 do
     if grep FoamFile $caseFile >/dev/null 2>&1
     then
         echo "Updating case file: $caseFile"
-        sed -n '/FoamFile/,/}/p' $caseFile > FoamFile.tmp
+        sed -n '/FoamFile/,/}/p' $caseFile > $tmpFile
 
-        FORMAT=$(FoamFileAttribute format FoamFile.tmp)
-        CLASS=$(FoamFileAttribute  class  FoamFile.tmp)
-        OBJECT=$(FoamFileAttribute object FoamFile.tmp)
-        # extract NOTE?
+        format=$(FoamFileAttribute format $tmpFile)
+        class=$(FoamFileAttribute  class  $tmpFile)
+        object=$(FoamFileAttribute object $tmpFile)
+        # extract note? - needs special handling
+        unset note
 
-        printHeader $FORMAT $CLASS $OBJECT $NOTE > FoamFile.tmp
-        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> FoamFile.tmp
+        printHeader $format $class $object "$note" > $tmpFile
+
+        sed '1,/}/d' $caseFile | sed '/./,/^$/!d' >> $tmpFile
 
         # use cat to avoid removing/replace soft-links
-        [ -s FoamFile.tmp ] && cat FoamFile.tmp >| $caseFile
-        rm -f FoamFile.tmp 2>/dev/null
+        [ -s $tmpFile ] && cat $tmpFile >| $caseFile
+        rm -f $tmpFile 2>/dev/null
     else
         echo " Invalid case file: $caseFile" 1>&2
     fi
 done
 
-#------------------------------------------------------------------------------
+#------------------------------------------------------------------ end-of-file
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 27725cf1cd..abd7bd1a00 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -2,7 +2,7 @@
 #
 #+TITLE:                 OpenFOAM C++ style guide
 #+AUTHOR:                      OpenCFD Ltd.
-#+DATE:                       November 2009
+#+DATE:                         April 2010
 #+LINK:                  http://www.opencfd.co.uk
 #+OPTIONS: author:nil ^:{}
 
@@ -18,97 +18,116 @@
       made with 'break' or 'continue' as part of a control structure.
 
     + stream output
-      =<<= is always four characters after the start of the stream,
-      so that the =<<= symbols align, i.e.
+      + =<<= is always four characters after the start of the stream,
+        so that the =<<= symbols align, i.e.
 
-    :Info<< ...
-    :os  << ...
+#+BEGIN_EXAMPLE
+    Info<< ...
+    os  << ...
+#+END_EXAMPLE
 
       so
 
-    :WarningIn("className::functionName()")
-    :    << "Warning message"
+#+BEGIN_EXAMPLE
+    WarningIn("className::functionName()")
+        << "Warning message"
+#+END_EXAMPLE
 
       NOT
 
-    :WarningIn("className::functionName()")
-    :<< "Warning message"
+#+BEGIN_EXAMPLE
+    WarningIn("className::functionName()")
+    << "Warning message"
+#+END_EXAMPLE
 
 
     + no unnecessary class section headers, i.e. remove
 
-    :// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-    :
-    :// Check
-    :
-    :// Edit
-    :
-    :// Write
+#+BEGIN_EXAMPLE
+    // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+    // Check
+
+    // Edit
+
+    // Write
+#+END_EXAMPLE
+
 
       if they contain nothing, even if planned for 'future use'
 
     + class titles are centred
 
-    :/*---------------------------------------------------------------------------*\
-    :                        Class exampleClass Declaration
-    :\*---------------------------------------------------------------------------*/
+#+BEGIN_EXAMPLE
+    /*---------------------------------------------------------------------------*\
+                            Class exampleClass Declaration
+    \*---------------------------------------------------------------------------*/
+#+END_EXAMPLE
 
       NOT
 
-    :/*---------------------------------------------------------------------------*\
-    :               Class exampleClass Declaration
-    :\*---------------------------------------------------------------------------*/
+#+BEGIN_EXAMPLE
+    /*---------------------------------------------------------------------------*\
+                Class exampleClass Declaration
+    \*---------------------------------------------------------------------------*/
+#+END_EXAMPLE
 
 *** The =.H= Files
     + header file spacing
-      Leave two empty lines between sections (as per functions in the =.C= file etc)
+      + Leave two empty lines between sections
+        (as per functions in the =.C= file etc)
 
     + use "//- Comment" comments in header file
       + add descriptions to class data and functions
     + destructor
-      If adding a comment to the destructor - use //- and code as a normal function:
+      + If adding a comment to the destructor -
+        use //- and code as a normal function:
 
-    ://- Destructor
-    :~className();
+#+BEGIN_EXAMPLE
+    //- Destructor
+    ~className();
+#+END_EXAMPLE
 
     + inline functions
-      Use inline functions where appropriate in a separate classNameI.H file.
-      Avoid cluttering the header file with function bodies.
+      + Use inline functions where appropriate in a separate classNameI.H file.
+        Avoid cluttering the header file with function bodies.
 
 *** The =.C= Files
     + Do not open/close namespaces in a =.C= file
-      Fully scope the function name, i.e.
+      + Fully scope the function name, i.e.
 
-    :Foam::returnType Foam::className::functionName()
+#+BEGIN_EXAMPLE
+    Foam::returnType Foam::className::functionName()
+#+END_EXAMPLE
 
       NOT
 
-    :namespace Foam
-    :{
-    :    ...
-    :
-    :    returnType className::functionName()
-    :
-    :    ...
-    :}
+#+BEGIN_EXAMPLE
+    namespace Foam
+    {
+        ...
+        returnType className::functionName()
+        ...
+    }
+#+END_EXAMPLE
 
       EXCEPTION
 
       When there are multiple levels of namespace, they may be used in the =.C=
       file, i.e.
 
-    :namespace Foam
-    :{
-    :namespace compressible
-    :{
-    :namespace RASModels
-    :{
-    :
-    :    ...
-    :
-    :} // End namespace RASModels
-    :} // End namespace compressible
-    :} // End namespace Foam
+#+BEGIN_EXAMPLE
+    namespace Foam
+    {
+    namespace compressible
+    {
+    namespace RASModels
+    {
+        ...
+    } // End namespace RASModels
+    } // End namespace compressible
+    } // End namespace Foam
+#+END_EXAMPLE
 
     + Use two empty lines between functions
 
@@ -131,64 +150,95 @@
       If a class is virtual - make all derived classes virtual.
 
 *** Conditional Statements
-    :if (condition)
-    :{
-    :    code;
-    :}
+#+BEGIN_EXAMPLE
+    if (condition)
+    {
+        code;
+    }
+#+END_EXAMPLE
 
     OR
 
-    :if
-    :(
-    :   long condition
-    :)
-    :{
-    :    code;
-    :}
+#+BEGIN_EXAMPLE
+    if
+    (
+       long condition
+    )
+    {
+        code;
+    }
+#+END_EXAMPLE
 
     NOT (no space between "if" and "(")
 
-    :if(condition)
-    :{
-    :    code;
-    :}
+#+BEGIN_EXAMPLE
+    if(condition)
+    {
+        code;
+    }
+#+END_EXAMPLE
 
 *** =for= and =while= Loops
-    :for (i = 0; i < maxI; i++)
-    :{
-    :    code;
-    :}
+
+#+BEGIN_EXAMPLE
+    for (i = 0; i < maxI; i++)
+    {
+        code;
+    }
+#+END_EXAMPLE
 
     OR
 
-    :for
-    :(
-    :    i = 0;
-    :    i < maxI;
-    :    i++
-    :)
-    :{
-    :    code;
-    :}
+#+BEGIN_EXAMPLE
+    for
+    (
+        i = 0;
+        i < maxI;
+        i++
+    )
+    {
+        code;
+    }
+#+END_EXAMPLE
 
     NOT (no space between "for" and "(")
 
-    :for(i = 0; i < maxI; i++)
-    :{
-    :    code;
-    :}
+#+BEGIN_EXAMPLE
+    for(i = 0; i < maxI; i++)
+    {
+        code;
+    }
+#+END_EXAMPLE
 
     Note that when indexing through iterators, it is often slightly more
     efficient to use the pre-increment form. Eg, =++iter= instead of =iter++=
 
-*** =forAll= , =forAllIter=, etc. loops
+*** =forAll=, =forAllIter=, =forAllConstIter=, etc. loops
     like =for= loops, but
 
-    :forAll(
+#+BEGIN_EXAMPLE
+    forAll(
+#+END_EXAMPLE
 
     NOT
 
-    :forAll (
+#+BEGIN_EXAMPLE
+    forAll (
+#+END_EXAMPLE
+
+    Using the =forAllIter= and =forAllConstIter= macros is generally
+    advantageous - less typing, easier to find later.  However, since
+    they are macros, they will fail if the iterated object contains
+    any commas.
+
+    The following will FAIL!:
+
+#+BEGIN_EXAMPLE
+    forAllIter(HashTable<labelPair, edge, Hash<edge> >, foo, iter)
+#+END_EXAMPLE
+
+    These convenience macros are also generally avoided in other
+    container classes and OpenFOAM primitive classes.
 
 *** Splitting Over Multiple Lines
 
@@ -198,64 +248,81 @@
      + do not put "const" onto its own line - use a split to keep it with
        the function name and arguments.
 
-     so:
+     so
 
-     :const Foam::longReturnTypeName&
-     :Foam::longClassName::longFunctionName const
+#+BEGIN_EXAMPLE
+     const Foam::longReturnTypeName&
+     Foam::longClassName::longFunctionName const
+#+END_EXAMPLE
 
      NOT
 
-     :const Foam::longReturnTypeName&
-     :    Foam::longClassName::longFunctionName const
+#+BEGIN_EXAMPLE
+     const Foam::longReturnTypeName&
+         Foam::longClassName::longFunctionName const
+#+END_EXAMPLE
 
      NOR
 
-     :const Foam::longReturnTypeName& Foam::longClassName::longFunctionName
-     :const
+#+BEGIN_EXAMPLE
+     const Foam::longReturnTypeName& Foam::longClassName::longFunctionName
+     const
+#+END_EXAMPLE
 
      NOR
 
-     :const Foam::longReturnTypeName& Foam::longClassName::
-     :longFunctionName const
-
+#+BEGIN_EXAMPLE
+     const Foam::longReturnTypeName& Foam::longClassName::
+     longFunctionName const
+#+END_EXAMPLE
 
      + if it needs to be split again, split at the function name (leaving
        behind the preceding scoping "::"s), and again, left align, i.e.
 
      For example,
 
-     :const Foam::longReturnTypeName&
-     :Foam::veryveryveryverylongClassName::
-     :veryveryveryverylongFunctionName const
+#+BEGIN_EXAMPLE
+     const Foam::longReturnTypeName&
+     Foam::veryveryveryverylongClassName::
+     veryveryveryverylongFunctionName const
+#+END_EXAMPLE
 
 **** Splitting long lines at an "="
 
      Indent after split
 
-     :variableName =
-     :    longClassName.longFunctionName(longArgument);
+#+BEGIN_EXAMPLE
+     variableName =
+         longClassName.longFunctionName(longArgument);
+#+END_EXAMPLE
 
      OR (where necessary)
 
-     :variableName =
-     :    longClassName.longFunctionName
-     :    (
-     :        longArgument1,
-     :        longArgument2
-     :    );
+#+BEGIN_EXAMPLE
+     variableName =
+         longClassName.longFunctionName
+         (
+             longArgument1,
+             longArgument2
+         );
+#+END_EXAMPLE
 
      NOT
 
-     :variableName =
-     :longClassName.longFunctionName(longArgument);
+#+BEGIN_EXAMPLE
+     variableName =
+     longClassName.longFunctionName(longArgument);
+#+END_EXAMPLE
 
      NOR
 
-     :variableName = longClassName.longFunctionName
-     :(
-     :    longArgument1,
-     :    longArgument2
-     :);
+#+BEGIN_EXAMPLE
+     variableName = longClassName.longFunctionName
+     (
+         longArgument1,
+         longArgument2
+     );
+#+END_EXAMPLE
 
 *** Maths and Logic
     + operator spacing
@@ -267,34 +334,41 @@
       + a || b, a && b
 
     + splitting formulae over several lines
+
       Split and indent as per "splitting long lines at an "=""
       with the operator on the lower line.  Align operator so that first
       variable, function or bracket on the next line is 4 spaces indented i.e.
 
-    :variableName =
-    :    a * (a + b)
-    :  - exp(c/d)
-    :  * (k + t);
+#+BEGIN_EXAMPLE
+    variableName =
+        a * (a + b)
+      - exp(c/d)
+      * (k + t);
+#+END_EXAMPLE
 
       This is sometime more legible when surrounded by extra parentheses:
 
-    :variableName =
-    :(
-    :    a * (a + b)
-    :  - exp(c/d)
-    :  * (k + t)
-    :);
+#+BEGIN_EXAMPLE
+    variableName =
+    (
+        a * (a + b)
+      - exp(c/d)
+      * (k + t)
+    );
+#+END_EXAMPLE
 
     + splitting logical tests over several lines
 
       outdent the operator so that the next variable to test is aligned with
       the four space indentation, i.e.
 
-    :if
-    :(
-    :    a == true
-    : && b == c
-    :)
+#+BEGIN_EXAMPLE
+    if
+    (
+        a == true
+     && b == c
+    )
+#+END_EXAMPLE
 
 ** Documentation
 
@@ -315,14 +389,16 @@
 
       For example,
 
-    :Class
-    :    Foam::myClass
-    :
-    :Description
-    :    A class for specifying the documentation style.
-    :
-    :    The class is implemented as a set of recommendations that may
-    :    sometimes be useful.
+#+BEGIN_EXAMPLE
+    Class
+        Foam::myClass
+
+    Description
+        A class for specifying the documentation style.
+
+        The class is implemented as a set of recommendations that may
+        sometimes be useful.
+#+END_EXAMPLE
 
     + The class name must be qualified by its namespace, otherwise Doxygen
       will think you are documenting some other class.
@@ -332,11 +408,13 @@
       finding these under-documented classes later.
 
 
-    :Class
-    :    Foam::myUnderDocumentedClass
-    :
-    :Description
-    :    Foam::myUnderDocumentedClass
+#+BEGIN_EXAMPLE
+    Class
+        Foam::myUnderDocumentedClass
+
+    Description
+        Foam::myUnderDocumentedClass
+#+END_EXAMPLE
 
 
     + Use 'Class' and 'Namespace' tags in the header files.
@@ -346,11 +424,13 @@
       The Description block then applies to documenting the file itself.
 
 
-    :InClass
-    :    Foam::myClass
-    :
-    :Description
-    :    Implements the read and writing of files.
+#+BEGIN_EXAMPLE
+    InClass
+        Foam::myClass
+
+    Description
+        Implements the read and writing of files.
+#+END_EXAMPLE
 
 *** Doxygen Special Commands
 
@@ -368,29 +448,31 @@
     Doxygen commmands can be inserted within the block without problems.
 
 
-    :InClass
-    :    Foam::myClass
-    :
-    :Description
-    :    Implements the read and writing of files.
-    :
-    :    An example input file:
-    :    @verbatim
-    :        patchName
-    :        {
-    :            type        myPatchType;
-    :            refValue    100;
-    :            value       uniform 1;
-    :        }
-    :    @endverbatim
-    :
-    :    Within the implementation, a loop over all patches is done:
-    :    @code
-    :        forAll(patches, patchI)
-    :        {
-    :            ...  // some operation
-    :        }
-    :    @endcode
+#+BEGIN_EXAMPLE
+    InClass
+        Foam::myClass
+
+    Description
+        Implements the read and writing of files.
+
+        An example input file:
+        @verbatim
+            patchName
+            {
+                type        myPatchType;
+                refValue    100;
+                value       uniform 1;
+            }
+        @endverbatim
+
+        Within the implementation, a loop over all patches is done:
+        @code
+            forAll(patches, patchI)
+            {
+                ...  // some operation
+            }
+        @endcode
+#+END_EXAMPLE
 
 *** HTML Special Commands
 
@@ -399,28 +481,34 @@
     Doxygen to complain, but seem to work anyhow.
 
     eg,
-    + The template with type <HR> is a bad example.
+    + The template with type =<HR>= is a bad example.
 
-    + The template with type \<HR\> is a better example.
+    + The template with type =\<HR\>= is a better example.
 
-    + The template with type <Type> causes Doxygen to complain about an
+    + The template with type =<Type>= causes Doxygen to complain about an
       unknown html type, but it seems to work okay anyhow.
 
 
 *** Documenting Namespaces
 
-    + If namespaces are explictly declared with the Namespace() macro,
+    + If namespaces are explictly declared with the =Namespace()= macro,
       they should be documented there.
 
     + If the namespaces is used to hold sub-models, the namespace can be
       documented in the same file as the class with the model selector.
       eg,
-    :documented namespace 'Foam::functionEntries' within the
-    :class 'Foam::functionEntry'
+
+#+BEGIN_EXAMPLE
+    documented namespace 'Foam::functionEntries' within the
+    class 'Foam::functionEntry'
+#+END_EXAMPLE
 
     + If nothing else helps, find some sensible header.
       eg,
-    :namespace 'Foam' is documented in the foamVersion.H file
+
+#+BEGIN_EXAMPLE
+    namespace 'Foam' is documented in the foamVersion.H file
+#+END_EXAMPLE
 
 
 *** Documenting Typedefs and classes defined via macros
@@ -459,7 +547,9 @@
     Press.
 
     Eg,
-    :myClass.initialize()
+#+BEGIN_EXAMPLE
+    myClass.initialize()
+#+END_EXAMPLE
 
 
     The word "its" (possesive) vs. "it's" (colloquial for "it is" or "it has")
@@ -468,4 +558,3 @@
     Any remaining "it's" are likely an incorrect spelling of "its".
 
 
-
diff --git a/src/ODE/ODE/ODE.H b/src/ODE/ODE/ODE.H
index 91660dc2e1..0523e334b1 100644
--- a/src/ODE/ODE/ODE.H
+++ b/src/ODE/ODE/ODE.H
@@ -56,10 +56,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~ODE()
-        {}
+    //- Destructor
+    virtual ~ODE()
+    {}
 
 
     // Member Functions
diff --git a/src/ODE/ODESolvers/ODESolver/ODESolver.H b/src/ODE/ODESolvers/ODESolver/ODESolver.H
index 7dde5e108d..ea3607e008 100644
--- a/src/ODE/ODESolvers/ODESolver/ODESolver.H
+++ b/src/ODE/ODESolvers/ODESolver/ODESolver.H
@@ -103,10 +103,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ODESolver()
-        {}
+    //- Destructor
+    virtual ~ODESolver()
+    {}
 
 
     // Member Functions
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 2aae9b38a0..7eb609b246 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -102,9 +102,8 @@ public:
         //- Construct from std::string (or string), optionally ignoring case
         regExp(const std::string&, const bool ignoreCase=false);
 
-    // Destructor
-
-        ~regExp();
+    //- Destructor
+    ~regExp();
 
 
     // Member functions
diff --git a/src/OSspecific/POSIX/signals/sigFpe.H b/src/OSspecific/POSIX/signals/sigFpe.H
index 8cdfa22071..549efb9928 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.H
+++ b/src/OSspecific/POSIX/signals/sigFpe.H
@@ -99,9 +99,8 @@ public:
         sigFpe();
 
 
-    // Destructor
-
-        ~sigFpe();
+    //- Destructor
+    ~sigFpe();
 
 
     // Member functions
diff --git a/src/OSspecific/POSIX/signals/sigInt.H b/src/OSspecific/POSIX/signals/sigInt.H
index 1344fedf90..4c2f15ba2e 100644
--- a/src/OSspecific/POSIX/signals/sigInt.H
+++ b/src/OSspecific/POSIX/signals/sigInt.H
@@ -70,9 +70,8 @@ public:
         sigInt();
 
 
-    // Destructor
-
-        ~sigInt();
+    //- Destructor
+    ~sigInt();
 
 
     // Member functions
diff --git a/src/OSspecific/POSIX/signals/sigQuit.H b/src/OSspecific/POSIX/signals/sigQuit.H
index 46b110dda1..108ad94d79 100644
--- a/src/OSspecific/POSIX/signals/sigQuit.H
+++ b/src/OSspecific/POSIX/signals/sigQuit.H
@@ -70,9 +70,8 @@ public:
         sigQuit();
 
 
-    // Destructor
-
-        ~sigQuit();
+    //- Destructor
+    ~sigQuit();
 
 
     // Member functions
diff --git a/src/OSspecific/POSIX/signals/sigSegv.H b/src/OSspecific/POSIX/signals/sigSegv.H
index 4dc1ab7389..276644e257 100644
--- a/src/OSspecific/POSIX/signals/sigSegv.H
+++ b/src/OSspecific/POSIX/signals/sigSegv.H
@@ -70,9 +70,8 @@ public:
         sigSegv();
 
 
-    // Destructor
-
-        ~sigSegv();
+    //- Destructor
+    ~sigSegv();
 
 
     // Member functions
diff --git a/src/OSspecific/POSIX/timer.H b/src/OSspecific/POSIX/timer.H
index 861fccbb4b..c74b08f2d3 100644
--- a/src/OSspecific/POSIX/timer.H
+++ b/src/OSspecific/POSIX/timer.H
@@ -117,9 +117,8 @@ public:
         timer(const unsigned int newTimeOut);
 
 
-    // Destructor
-
-        ~timer();
+    //- Destructor
+    ~timer();
 };
 
 
diff --git a/src/OpenFOAM/algorithms/subCycle/subCycle.H b/src/OpenFOAM/algorithms/subCycle/subCycle.H
index 5a5d907cfb..6dd105e334 100644
--- a/src/OpenFOAM/algorithms/subCycle/subCycle.H
+++ b/src/OpenFOAM/algorithms/subCycle/subCycle.H
@@ -40,7 +40,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class subCycle Declaration
+                          Class subCycle Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class GeometricField>
@@ -79,21 +79,19 @@ public:
         {}
 
 
-    // Destructor
+    //- Destructor
+    ~subCycle()
+    {
+        // End the subCycleTime, which restores the time state
+        endSubCycle();
 
-        ~subCycle()
-        {
-            // End the subCycleTime which restores the time state
-            endSubCycle();
+        // Correct the time index of the field to correspond to the global time
+        gf_.timeIndex() = gf_.time().timeIndex();
 
-            // Correct the time index of the field to correspond to the global
-            // time
-            gf_.timeIndex() = gf_.time().timeIndex();
-
-            // Reset the old-time field value
-            gf_.oldTime() = gf0_;
-            gf_.oldTime().timeIndex() = gf_.time().timeIndex();
-        }
+        // Reset the old-time field value
+        gf_.oldTime() = gf0_;
+        gf_.oldTime().timeIndex() = gf_.time().timeIndex();
+    }
 };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index 1ca2f7c641..e355a803fe 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -95,9 +95,8 @@ public:
         HashPtrTable(const HashPtrTable<T, Key, Hash>&);
 
 
-    // Destructor
-
-        ~HashPtrTable();
+    //- Destructor
+    ~HashPtrTable();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index 0c7e24d65f..6bb7c256bd 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -80,7 +80,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
 {
     List<Keyed<T> > newList(lst.size());
 
-    forAll (lst, elemI)
+    forAll(lst, elemI)
     {
         newList[elemI] = Keyed(lst[elemI], key);
     }
@@ -106,7 +106,7 @@ Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
 
     List<Keyed<T> > newList(lst.size());
 
-    forAll (lst, elemI)
+    forAll(lst, elemI)
     {
         newList[elemI] = Keyed(lst[elemI], keys[elemI]);
     }
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
index d4ac883754..a5bec70c4c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
@@ -120,9 +120,8 @@ public:
         ILList(Istream&, const INew&);
 
 
-    // Destructor
-
-        ~ILList();
+    //- Destructor
+    ~ILList();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index c245ba84d7..90187dbcc7 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -122,9 +122,8 @@ public:
         LList(const LList<LListBase, T>&);
 
 
-    // Destructor
-
-        ~LList();
+    //- Destructor
+    ~LList();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index 18d6f61e85..136f34556f 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -112,9 +112,8 @@ public:
         LPtrList(const LPtrList&);
 
 
-    // Destructor
-
-        ~LPtrList();
+    //- Destructor
+    ~LPtrList();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 9e0742025f..d59cf4232d 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -110,9 +110,8 @@ public:
         inline DLListBase(link*);
 
 
-    // Destructor
-
-        ~DLListBase();
+    //- Destructor
+    ~DLListBase();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index c4dda77aa7..91ce9dc5ac 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -107,9 +107,8 @@ public:
         inline SLListBase(link*);
 
 
-    // Destructor
-
-        ~SLListBase();
+    //- Destructor
+    ~SLListBase();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index 726c8e563b..794a6a72c2 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,7 +113,7 @@ public:
         //- Construct by transferring the parameter contents
         explicit inline DynamicList(const Xfer<List<T> >&);
 
-        //- Construct from Istream. Size set to size of read list.
+        //- Construct from Istream. Size set to size of list read.
         explicit DynamicList(Istream&);
 
 
@@ -138,7 +138,8 @@ public:
             //  setting values (as per List usage).
             inline void setSize(const label);
 
-            //- Alter the addressed list size and fill new space with a constant.
+            //- Alter the addressed list size and fill new space with a
+            //  constant.
             inline void setSize(const label, const T&);
 
             //- Alter the addressed list size.
@@ -147,7 +148,8 @@ public:
             //  setting values (as per List usage).
             inline void resize(const label);
 
-            //- Alter the addressed list size and fill new space with a constant.
+            //- Alter the addressed list size and fill new space with a
+            //  constant.
             inline void resize(const label, const T&);
 
             //- Reserve allocation space for at least this size.
@@ -165,10 +167,10 @@ public:
             //  Returns a reference to the DynamicList.
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& shrink();
 
-            //- Transfer contents of the argument List into this DynamicList
+            //- Transfer contents of the argument List into this.
             inline void transfer(List<T>&);
 
-            //- Transfer contents of the argument DynamicList into this DynamicList
+            //- Transfer contents of the argument DynamicList into this.
             inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
 
             //- Transfer contents to the Xfer container as a plain List
@@ -189,7 +191,8 @@ public:
             //- Remove and return the top element
             inline T remove();
 
-            //- Return non-const access to an element, resizing list if necessary
+            //- Return non-const access to an element, resizing list if
+            //  necessary
             inline T& operator()(const label);
 
             //- Assignment of all addressed entries to the given value
diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H
index 7117e3400d..991f0e5848 100644
--- a/src/OpenFOAM/db/Callback/Callback.H
+++ b/src/OpenFOAM/db/Callback/Callback.H
@@ -76,9 +76,8 @@ public:
         Callback(const Callback<CallbackType>&);
 
 
-    // Destructor
-
-        virtual ~Callback();
+    //- Destructor
+    virtual ~Callback();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
index c812eceefb..655bec7b9f 100644
--- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
+++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H
@@ -86,9 +86,8 @@ public:
         CallbackRegistry();
 
 
-    // Destructor
-
-        virtual ~CallbackRegistry();
+    //- Destructor
+    virtual ~CallbackRegistry();
 };
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index d6befd123d..32ce285bfd 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -219,9 +219,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~IOobject();
+    //- Destructor
+    virtual ~IOobject();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 02640c095b..de9a64c2a1 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -152,12 +152,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
 {
     IOobjectList objectsOfClass(size());
 
-    for
-    (
-        HashPtrTable<IOobject>::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
     {
         if (iter()->headerClassName() == ClassName)
         {
@@ -192,12 +187,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
     wordList objectNames(size());
 
     label count = 0;
-    for
-    (
-        HashPtrTable<IOobject>::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
     {
         if (iter()->headerClassName() == ClassName)
         {
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 4348af6fdf..3b62049452 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -76,9 +76,8 @@ public:
         IOobjectList(const IOobjectList&);
 
 
-    // Destructor
-
-        ~IOobjectList();
+    //- Destructor
+    ~IOobjectList();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
index ac0df4d91a..9c003f8020 100644
--- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H
+++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H
@@ -74,9 +74,8 @@ public:
         IOField(const IOobject&, const Xfer<Field<Type> >&);
 
 
-    // Destructor
-
-        virtual ~IOField();
+    //- Destructor
+    virtual ~IOField();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
index 3ef8ee667b..55c9817b23 100644
--- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H
+++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H
@@ -75,9 +75,8 @@ public:
         IOList(const IOobject&, const Xfer<List<T> >&);
 
 
-    // Destructor
-
-        virtual ~IOList();
+    //- Destructor
+    virtual ~IOList();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
index ed9669b349..5fd5ba3051 100644
--- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
+++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H
@@ -75,9 +75,8 @@ public:
         IOMap(const IOobject&, const Xfer<Map<T> >&);
 
 
-    // Destructor
-
-        virtual ~IOMap();
+    //- Destructor
+    virtual ~IOMap();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
index 0787e84d9a..4a78b76c25 100644
--- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
+++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H
@@ -79,9 +79,8 @@ public:
         IOPtrList(const IOobject&, const Xfer<PtrList<T> >&);
 
 
-    // Destructor
-
-        virtual ~IOPtrList();
+    //- Destructor
+    virtual ~IOPtrList();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
index c680dc6915..138daa24d8 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.H
@@ -71,9 +71,8 @@ public:
         IOdictionary(const IOobject&, const dictionary&);
 
 
-    // Destructor
-
-        virtual ~IOdictionary();
+    //- Destructor
+    virtual ~IOdictionary();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
index 9cf2327425..be61d2f6a6 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.H
@@ -70,9 +70,8 @@ class IFstreamAllocator
         IFstreamAllocator(const fileName& pathname);
 
 
-    // Destructor
-
-        ~IFstreamAllocator();
+    //- Destructor
+    ~IFstreamAllocator();
 };
 
 
@@ -106,9 +105,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~IFstream();
+    //- Destructor
+    ~IFstream();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
index cc496c5823..58e3a2f7a3 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
@@ -69,9 +69,8 @@ class OFstreamAllocator
             IOstream::compressionType compression=IOstream::UNCOMPRESSED
         );
 
-    // Destructor
-
-        ~OFstreamAllocator();
+    //- Destructor
+    ~OFstreamAllocator();
 
 };
 
@@ -108,9 +107,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~OFstream();
+    //- Destructor
+    ~OFstream();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 33f24c9857..3897b26444 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -288,10 +288,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~IOstream()
-        {}
+    //- Destructor
+    virtual ~IOstream()
+    {}
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
index 52fddbb408..d546395cbd 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
@@ -85,10 +85,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~Istream()
-        {}
+    //- Destructor
+    virtual ~Istream()
+    {}
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
index e70eccfabb..2229cd72dc 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
@@ -131,9 +131,8 @@ public:
             IOstream::versionNumber version=IOstream::currentVersion
         );
 
-    // Destructor
-
-        ~PstreamBuffers();
+    //- Destructor
+    ~PstreamBuffers();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
index b848eeb587..2378d76ac9 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
@@ -106,9 +106,8 @@ public:
         UIPstream(const int fromProcNo, PstreamBuffers&);
 
 
-    // Destructor
-
-        ~UIPstream();
+    //- Destructor
+    ~UIPstream();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
index e88e84d8a3..bea3a94423 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.H
@@ -102,9 +102,8 @@ public:
         UOPstream(const int toProcNo, PstreamBuffers&);
 
 
-    // Destructor
-
-        ~UOPstream();
+    //- Destructor
+    ~UOPstream();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
index d1454cbff2..48d18bd6e8 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
@@ -86,10 +86,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ISstream()
-        {}
+    //- Destructor
+    virtual ~ISstream()
+    {}
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
index b2e0990357..1dc1001eac 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/IStringStream.H
@@ -92,12 +92,11 @@ public:
         {}
 
 
-    // Destructor
-
-        ~IStringStream()
-        {
-            delete &dynamic_cast<std::istringstream&>(stdStream());
-        }
+    //- Destructor
+    ~IStringStream()
+    {
+        delete &dynamic_cast<std::istringstream&>(stdStream());
+    }
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
index 72bfd08e7a..e32e156f2a 100644
--- a/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
+++ b/src/OpenFOAM/db/IOstreams/StringStreams/OStringStream.H
@@ -93,12 +93,11 @@ public:
         {}
 
 
-    // Destructor
-
-        ~OStringStream()
-        {
-            delete &dynamic_cast<std::ostringstream&>(stdStream());
-        }
+    //- Destructor
+    ~OStringStream()
+    {
+        delete &dynamic_cast<std::ostringstream&>(stdStream());
+    }
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
index 5c16ec54bb..9754a65afe 100644
--- a/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
+++ b/src/OpenFOAM/db/IOstreams/hashes/OSHA1stream.H
@@ -165,12 +165,11 @@ public:
         {}
 
 
-    // Destructor
-
-        ~OSHA1stream()
-        {
-            delete &dynamic_cast<osha1stream&>(stdStream());
-        }
+    //- Destructor
+    ~OSHA1stream()
+    {
+        delete &dynamic_cast<osha1stream&>(stdStream());
+    }
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/IOstreams/token/CompoundToken.H b/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
index 1c0f8e7039..5cc12994e5 100644
--- a/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
+++ b/src/OpenFOAM/db/IOstreams/token/CompoundToken.H
@@ -99,9 +99,8 @@ public:
         static autoPtr<CompoundToken> New(const word& type, Istream& is);
 
 
-    // Destructor
-
-        virtual ~CompoundToken();
+    //- Destructor
+    virtual ~CompoundToken();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index acf7852c88..fc7d1d6ee7 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -167,9 +167,8 @@ public:
             static autoPtr<compound> New(const word& type, Istream&);
 
 
-        // Destructor
-
-            virtual ~compound();
+        //- Destructor
+        virtual ~compound();
 
 
         // Member Functions
@@ -309,9 +308,8 @@ public:
         token(Istream&);
 
 
-    // Destructor
-
-        inline ~token();
+    //- Destructor
+    inline ~token();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 8e18dc7861..36bccb3911 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -518,11 +518,28 @@ bool Foam::Time::loop()
 
     if (running)
     {
-        operator++();
+        if (!subCycling_)
+        {
+            readModifiedObjects();
+
+            if (timeIndex_ == startTimeIndex_)
+            {
+                functionObjects_.start();
+            }
+            else
+            {
+                functionObjects_.execute();
+            }
+        }
 
         // Check update the "running" status following the "++" operation
         // to take into account possible side-effects from functionObjects
         running = run();
+
+        if (running)
+        {
+            operator++();
+        }
     }
 
     return running;
@@ -667,20 +684,6 @@ Foam::Time& Foam::Time::operator+=(const scalar deltaT)
 
 Foam::Time& Foam::Time::operator++()
 {
-    if (!subCycling_)
-    {
-        readModifiedObjects();
-
-        if (timeIndex_ == startTimeIndex_)
-        {
-            functionObjects_.start();
-        }
-        else
-        {
-            functionObjects_.execute();
-        }
-    }
-
     deltaT0_ = deltaTSave_;
     deltaTSave_ = deltaT_;
 
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index a5e39b751b..7596fee0c9 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -209,10 +209,8 @@ public:
         );
 
 
-    // Destructor
-
-        //- Virtual destructor
-        virtual ~Time();
+    //- Destructor
+    virtual ~Time();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/Time/subCycleTime.H b/src/OpenFOAM/db/Time/subCycleTime.H
index 677ea12fe4..02224cfed5 100644
--- a/src/OpenFOAM/db/Time/subCycleTime.H
+++ b/src/OpenFOAM/db/Time/subCycleTime.H
@@ -63,9 +63,8 @@ public:
         subCycleTime(Time&, const label nSubCycles);
 
 
-    // Destructor
-
-        ~subCycleTime();
+    //- Destructor
+    ~subCycleTime();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 6e463f8b3b..e2a054dcb1 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -502,7 +502,7 @@ Foam::wordList Foam::dictionary::toc() const
     wordList keys(size());
 
     label nKeys = 0;
-    forAllConstIter(IDLList<entry>::const_iterator, *this, iter)
+    forAllConstIter(IDLList<entry>, *this, iter)
     {
         keys[nKeys++] = iter().keyword();
     }
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 759287482c..c483aed557 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -218,9 +218,8 @@ public:
         static autoPtr<dictionary> New(Istream&);
 
 
-    // Destructor
-
-        ~dictionary();
+    //- Destructor
+    ~dictionary();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
index 2cc16bbec8..90cf9e5b0e 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.C
@@ -54,7 +54,7 @@ Foam::dlLibraryTable::readDlLibrary::readDlLibrary
 
 Foam::dlLibraryTable::~dlLibraryTable()
 {
-    forAllIter(dlLibraryTable, *this, iter)
+    forAllConstIter(dlLibraryTable, *this, iter)
     {
         dlclose(iter.key());
     }
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
index e43ccde86b..cc7bdac50d 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
@@ -88,9 +88,8 @@ public:
         dlLibraryTable();
 
 
-    // Destructor
-
-        ~dlLibraryTable();
+    //- Destructor
+    ~dlLibraryTable();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 25f837fd6f..9ad11f7a0f 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -97,9 +97,8 @@ public:
         error(const error&);
 
 
-    // Destructor
-
-        virtual ~error() throw();
+    //- Destructor
+    virtual ~error() throw();
 
 
     // Member functions
@@ -213,9 +212,8 @@ public:
         IOerror(const dictionary&);
 
 
-    // Destructor
-
-        virtual ~IOerror() throw();
+    //- Destructor
+    virtual ~IOerror() throw();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 8f4baa22b8..bc223bedb1 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -135,9 +135,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~functionObject();
+    //- Destructor
+    virtual ~functionObject();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
index 87599a3c1b..865e4cb2c4 100644
--- a/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
+++ b/src/OpenFOAM/db/functionObjects/outputFilterOutputControl/outputFilterOutputControl.H
@@ -91,8 +91,8 @@ public:
         outputFilterOutputControl(const Time&, const dictionary&);
 
 
-    // Destructor
-        ~outputFilterOutputControl();
+    //- Destructor
+    ~outputFilterOutputControl();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 433c5ac59a..10165b3e97 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~objectRegistry();
+    //- Destructor
+    virtual ~objectRegistry();
 
 
     // Member functions
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index 7db81dcec7..f3c2cc83f8 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -110,9 +110,8 @@ public:
         regIOobject(const regIOobject&, bool registerCopy);
 
 
-    // Destructor
-
-        virtual ~regIOobject();
+    //- Destructor
+    virtual ~regIOobject();
 
 
     // Member functions
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index 38ef887f40..13c4c572ac 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -53,10 +53,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~FieldMapper()
-        {}
+    //- Destructor
+    virtual ~FieldMapper()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index 549b662719..705505a716 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -379,7 +379,7 @@ interfaces() const
 {
     lduInterfaceFieldPtrsList interfaces(this->size());
 
-    forAll (interfaces, patchi)
+    forAll(interfaces, patchi)
     {
         if (isA<lduInterfaceField>(this->operator[](patchi)))
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
index 6fae84d14b..65d1a7542f 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C
@@ -50,7 +50,7 @@ slicedBoundaryField
 
     FieldField<PatchField, Type>& bf = tbf();
 
-    forAll (mesh.boundary(), patchi)
+    forAll(mesh.boundary(), patchi)
     {
         if (preserveCouples && mesh.boundary()[patchi].coupled())
         {
@@ -119,7 +119,7 @@ slicedBoundaryField
 
     FieldField<PatchField, Type>& bf = tbf();
 
-    forAll (mesh.boundary(), patchi)
+    forAll(mesh.boundary(), patchi)
     {
         if (preserveCouples && mesh.boundary()[patchi].coupled())
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
index b3ffb50c3c..362ddde906 100644
--- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H
@@ -158,9 +158,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SlicedGeometricField();
+    //- Destructor
+    ~SlicedGeometricField();
 
 
     // Member functions
@@ -202,9 +201,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~DimensionedInternalField();
+    //- Destructor
+    ~DimensionedInternalField();
 };
 
 
diff --git a/src/OpenFOAM/fields/cloud/mapClouds.H b/src/OpenFOAM/fields/cloud/mapClouds.H
index b52d15d540..898fbbdf0f 100644
--- a/src/OpenFOAM/fields/cloud/mapClouds.H
+++ b/src/OpenFOAM/fields/cloud/mapClouds.H
@@ -49,12 +49,7 @@ inline void mapClouds(const objectRegistry& db, const mapPolyMesh& mapper)
 {
     HashTable<const cloud*> clouds(db.lookupClass<cloud>());
 
-    for
-    (
-        HashTable<const cloud*>::iterator iter = clouds.begin();
-        iter != clouds.end();
-        ++iter
-    )
+    forAllIter(HashTable<const cloud*>, clouds, iter)
     {
         cloud& c = const_cast<cloud&>(*iter());
 
diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
index 17bcfc1cb8..b5474e46d7 100644
--- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
@@ -126,9 +126,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~processorPointPatchField();
+    //- Destructor
+    ~processorPointPatchField();
 
 
     // Member functions
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
index 8185f4ae42..1b18dbdc21 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
@@ -144,7 +144,7 @@ tmp<Field<Type1> > pointPatchField<Type>::patchInternalField
     tmp<Field<Type1> > tvalues(new Field<Type1>(meshPoints.size()));
     Field<Type1>& values = tvalues();
 
-    forAll (meshPoints, pointI)
+    forAll(meshPoints, pointI)
     {
         values[pointI] = iF[meshPoints[pointI]];
     }
@@ -202,7 +202,7 @@ void pointPatchField<Type>::addToInternalField
     // Get the addressing
     const labelList& mp = patch().meshPoints();
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         iF[mp[pointI]] += pF[pointI];
     }
@@ -292,7 +292,7 @@ void pointPatchField<Type>::setInInternalField
             << abort(FatalError);
     }
 
-    forAll (meshPoints, pointI)
+    forAll(meshPoints, pointI)
     {
         iF[meshPoints[pointI]] = pF[pointI];
     }
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
index ae6ce5eb93..8961fbb9db 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
@@ -229,10 +229,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointPatchField<Type>()
-        {}
+    //- Destructor
+    virtual ~pointPatchField<Type>()
+    {}
 
 
     // Member functions
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.H b/src/OpenFOAM/global/JobInfo/JobInfo.H
index 633fad11df..61d1c870f4 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.H
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.H
@@ -78,9 +78,8 @@ public:
         JobInfo();
 
 
-    // Destructor
-
-        ~JobInfo();
+    //- Destructor
+    ~JobInfo();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index fb567c113b..b3937e4495 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -750,6 +750,20 @@ Foam::argList::~argList()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::argList::printNotes() const
+{
+    // output notes directly - no automatic text wrapping
+    if (!notes.empty())
+    {
+        Info<< nl;
+        forAllConstIter(SLList<string>, notes, iter)
+        {
+            Info<< iter().c_str() << nl;
+        }
+    }
+}
+
+
 void Foam::argList::printUsage() const
 {
     Info<< "\nUsage: " << executable_ << " [OPTIONS]";
@@ -819,20 +833,7 @@ void Foam::argList::printUsage() const
     );
 
 
-    // output notes directly - no automatic text wrapping
-    if (!notes.empty())
-    {
-        Info<< nl;
-        for
-        (
-            SLList<string>::const_iterator iter = notes.begin();
-            iter != notes.end();
-            ++iter
-        )
-        {
-            Info<< iter().c_str() << nl;
-        }
-    }
+    printNotes();
 
     Info<< nl
         <<"Using OpenFOAM-" << Foam::FOAMversion
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 3e9785ebe4..c36955d5ce 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -329,6 +329,9 @@ public:
 
         // Print
 
+            //- Print notes (if any)
+            void printNotes() const;
+
             //- Print usage
             void printUsage() const;
 
diff --git a/src/OpenFOAM/graph/graph.C b/src/OpenFOAM/graph/graph.C
index 04e233cd82..1257377608 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/OpenFOAM/graph/graph.C
@@ -47,7 +47,7 @@ void graph::readCurves(Istream& is)
     x_.setSize(xyData.size());
     scalarField y(xyData.size());
 
-    forAll (xyData, i)
+    forAll(xyData, i)
     {
         x_[i] = xyData[i].x_;
         y[i] = xyData[i].y_;
@@ -191,18 +191,13 @@ void graph::writeTable(Ostream& os) const
 {
     forAll(x_, xi)
     {
-        os << setw(10) << x_[xi];
+        os  << setw(10) << x_[xi];
 
-        for
-        (
-            graph::const_iterator iter = begin();
-            iter != end();
-            ++iter
-        )
+        forAllConstIter(graph, *this, iter)
         {
-            os << token::SPACE << setw(10) << (*iter())[xi];
+            os  << token::SPACE << setw(10) << (*iter())[xi];
         }
-        os << endl;
+        os  << endl;
     }
 }
 
diff --git a/src/OpenFOAM/graph/graph.H b/src/OpenFOAM/graph/graph.H
index fe600590f7..57876270b9 100644
--- a/src/OpenFOAM/graph/graph.H
+++ b/src/OpenFOAM/graph/graph.H
@@ -226,10 +226,9 @@ public:
                     {}
 
 
-                // Destructor
-
-                    virtual ~writer()
-                    {}
+                //- Destructor
+                virtual ~writer()
+                {}
 
 
                 // Member Functions
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
index a36c14503b..48085787b7 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
+++ b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
@@ -51,7 +51,7 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
 
     bool firstField = true;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         if (!firstField)
         {
@@ -64,9 +64,9 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
     os << "; pause -1" << endl;
 
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
-        os << endl;
+        os  << endl;
         writeXY(g.x(), *iter(), os);
     }
 }
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
index 812a8db579..f5317a9c95 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
+++ b/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
@@ -67,10 +67,9 @@ public:
         {}
 
 
-    // Destructor
-
-        ~gnuplotGraph()
-        {}
+    //- Destructor
+    ~gnuplotGraph()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
index 2b60df9900..eff00c0d68 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
+++ b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
@@ -41,12 +41,12 @@ namespace Foam
 
 void Foam::jplotGraph::write(const graph& g, Ostream& os) const
 {
-    os  << "# JPlot file" << endl
+    os  << "# JPlot file" << nl
         << "# column 1: " << g.xName() << endl;
 
     label fieldI = 0;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         os  << "# column " << fieldI + 2 << ": " << (*iter()).name() << endl;
         fieldI++;
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
index 942ab78fde..8b329604c3 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
+++ b/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
@@ -67,10 +67,9 @@ public:
         {}
 
 
-    // Destructor
-
-        ~jplotGraph()
-        {}
+    //- Destructor
+    ~jplotGraph()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H b/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
index 9a526d71a4..707a0212d4 100644
--- a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
+++ b/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
@@ -67,10 +67,9 @@ public:
         {}
 
 
-    // Destructor
-
-        ~rawGraph()
-        {}
+    //- Destructor
+    ~rawGraph()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
index 94fbe319cc..4d9b07bde6 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
+++ b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
@@ -42,17 +42,17 @@ namespace Foam
 
 void Foam::xmgrGraph::write(const graph& g, Ostream& os) const
 {
-    os  << "@title " << g.title() << endl
-        << "@xaxis label " << g.xName() << endl
+    os  << "@title " << g.title() << nl
+        << "@xaxis label " << g.xName() << nl
         << "@yaxis label " << g.yName() << endl;
 
     label fieldI = 0;
 
-    for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter)
+    forAllConstIter(graph, g, iter)
     {
         os  << "@s" << fieldI << " legend "
-            << iter()->name() << endl
-            << "@target G0.S" << fieldI << endl
+            << iter()->name() << nl
+            << "@target G0.S" << fieldI << nl
             << "@type xy" << endl;
 
         writeXY(g.x(), *iter(), os);
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
index e6d4321767..d7e866b856 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
+++ b/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
@@ -68,10 +68,9 @@ public:
         {}
 
 
-    // Destructor
-
-        ~xmgrGraph()
-        {}
+    //- Destructor
+    ~xmgrGraph()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index e119b1a059..e101977abd 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -73,7 +73,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
     bool doWeights = false;
 
-    forAll (pointAddressing, pointI)
+    forAll(pointAddressing, pointI)
     {
         doWeights = false;
 
@@ -146,7 +146,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
             edgeList hitFaceEdges =
                 fromPatchFaces[proj[pointI].hitObject()].edges();
 
-            forAll (hitFaceEdges, edgeI)
+            forAll(hitFaceEdges, edgeI)
             {
                 minEdgeLength =
                     min
@@ -158,7 +158,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
             const labelList& curEdges = toPatchPointEdges[pointI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 minEdgeLength =
                     min
@@ -208,7 +208,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const
 
             pointField hitFacePoints = hitFace.points(fromPatchPoints);
 
-            forAll (hitFacePoints, masterPointI)
+            forAll(hitFacePoints, masterPointI)
             {
                 pointWeights[pointI][masterPointI] =
                     1.0/
@@ -252,7 +252,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
 
     vectorField fromPatchFaceCentres(fromPatchFaces.size());
 
-    forAll (fromPatchFaceCentres, faceI)
+    forAll(fromPatchFaceCentres, faceI)
     {
         fromPatchFaceCentres[faceI] =
             fromPatchFaces[faceI].centre(fromPatchPoints);
@@ -275,7 +275,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
     faceAddressingPtr_ = new labelList(proj.size(), -1);
     labelList& faceAddressing = *faceAddressingPtr_;
 
-    forAll (faceAddressing, faceI)
+    forAll(faceAddressing, faceI)
     {
         if (proj[faceI].hit())
         {
@@ -327,7 +327,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
 
                 faceWeights[faceI][0] = 1.0/m;
 
-                forAll (neighbours, nI)
+                forAll(neighbours, nI)
                 {
                     faceWeights[faceI][nI + 1] =
                     1.0/
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
index 5b5fdc7a5f..a2bad68c26 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C
@@ -71,7 +71,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
 
     const labelList& addr = pointAddr();
 
-    forAll (result, pointI)
+    forAll(result, pointI)
     {
         const scalarField& curWeights = weights[pointI];
 
@@ -80,7 +80,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::pointInterpolate
             const labelList& hitFacePoints =
                 fromPatchLocalFaces[addr[pointI]];
 
-            forAll (curWeights, wI)
+            forAll(curWeights, wI)
             {
                 result[pointI] += curWeights[wI]*pf[hitFacePoints[wI]];
             }
@@ -142,7 +142,7 @@ PatchToPatchInterpolation<FromPatch, ToPatch>::faceInterpolate
 
     const labelList& addr = faceAddr();
 
-    forAll (result, faceI)
+    forAll(result, faceI)
     {
         const scalarField& curWeights = weights[faceI];
 
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
index c2aecf3aa7..5c744df1ba 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H
@@ -163,9 +163,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~PatchToPatchInterpolation();
+    //- Destructor
+    ~PatchToPatchInterpolation();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
index fc8417855b..9c07ba575f 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H
@@ -99,9 +99,8 @@ public:
         PrimitivePatchInterpolation(const Patch& p);
 
 
-    // Destructor
-
-        ~PrimitivePatchInterpolation();
+    //- Destructor
+    ~PrimitivePatchInterpolation();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index 9baa4f0fb1..c7b561914e 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -116,9 +116,8 @@ public:
         inline autoPtr<Matrix<Form, Type> > clone() const;
 
 
-    // Destructor
-
-        ~Matrix();
+    //- Destructor
+    ~Matrix();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index fcd50eacd1..87dee6babc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -44,7 +44,7 @@ void Foam::lduAddressing::calcLosort() const
 
     const unallocLabelList& nbr = upperAddr();
 
-    forAll (nbr, nbrI)
+    forAll(nbr, nbrI)
     {
         nNbrOfFace[nbr[nbrI]]++;
     }
@@ -52,7 +52,7 @@ void Foam::lduAddressing::calcLosort() const
     // Create temporary neighbour addressing
     labelListList cellNbrFaces(size());
 
-    forAll (cellNbrFaces, cellI)
+    forAll(cellNbrFaces, cellI)
     {
         cellNbrFaces[cellI].setSize(nNbrOfFace[cellI]);
     }
@@ -61,7 +61,7 @@ void Foam::lduAddressing::calcLosort() const
     nNbrOfFace = 0;
 
     // Scatter the neighbour faces
-    forAll (nbr, nbrI)
+    forAll(nbr, nbrI)
     {
         cellNbrFaces[nbr[nbrI]][nNbrOfFace[nbr[nbrI]]] = nbrI;
 
@@ -76,11 +76,11 @@ void Foam::lduAddressing::calcLosort() const
     // Set counter for losort
     label lstI = 0;
 
-    forAll (cellNbrFaces, cellI)
+    forAll(cellNbrFaces, cellI)
     {
         const labelList& curNbr = cellNbrFaces[cellI];
 
-        forAll (curNbr, curNbrI)
+        forAll(curNbr, curNbrI)
         {
             lst[lstI] = curNbr[curNbrI];
             lstI++;
@@ -109,7 +109,7 @@ void Foam::lduAddressing::calcOwnerStart() const
     label nOwnStart = 0;
     label i = 1;
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         label curOwn = own[faceI];
 
@@ -148,7 +148,7 @@ void Foam::lduAddressing::calcLosortStart() const
     label nLsrtStart = 0;
     label i = 0;
 
-    forAll (lsrt, faceI)
+    forAll(lsrt, faceI)
     {
         // Get neighbour
         const label curNbr = nbr[lsrt[faceI]];
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index 9f971b3510..fedeaf60d2 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -158,9 +158,8 @@ public:
     {}
 
 
-    // Destructor
-
-        virtual ~lduAddressing();
+    //- Destructor
+    virtual ~lduAddressing();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
index 72e5e9389a..1010c17f98 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/cyclicLduInterface.H
@@ -57,9 +57,8 @@ public:
 
     // Constructors
 
-    // Destructor
-
-        virtual ~cyclicLduInterface();
+    //- Destructor
+    virtual ~cyclicLduInterface();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 60f6e448e6..2b65bedf8d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -75,9 +75,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~lduInterface();
+    //- Destructor
+    virtual ~lduInterface();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
index 8d39181c10..be3d050d7a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H
@@ -76,9 +76,8 @@ public:
         processorLduInterface();
 
 
-    // Destructor
-
-        virtual ~processorLduInterface();
+    //- Destructor
+    virtual ~processorLduInterface();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
index 0d3c3ef2e0..2d35035f57 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.H
@@ -63,9 +63,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~cyclicLduInterfaceField();
+    //- Destructor
+    virtual ~cyclicLduInterfaceField();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
index 57127bd4de..f07f1498a9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/lduInterfaceField/lduInterfaceField.H
@@ -85,9 +85,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~lduInterfaceField();
+    //- Destructor
+    virtual ~lduInterfaceField();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
index a04e57f8e9..7c3ae2e259 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/processorLduInterfaceField/processorLduInterfaceField.H
@@ -63,9 +63,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~processorLduInterfaceField();
+    //- Destructor
+    virtual ~processorLduInterfaceField();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index 860a593b83..924c1e51f0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -340,10 +340,9 @@ public:
 
 
 
-        // Destructor
-
-            virtual ~solver()
-            {}
+        //- Destructor
+        virtual ~solver()
+        {}
 
 
         // Member functions
@@ -492,10 +491,9 @@ public:
             );
 
 
-        // Destructor
-
-            virtual ~smoother()
-            {}
+        //- Destructor
+        virtual ~smoother()
+        {}
 
 
         // Member functions
@@ -607,10 +605,9 @@ public:
             );
 
 
-        // Destructor
-
-            virtual ~preconditioner()
-            {}
+        //- Destructor
+        virtual ~preconditioner()
+        {}
 
 
         // Member functions
@@ -677,9 +674,8 @@ public:
         lduMatrix(const lduMesh&, Istream&);
 
 
-    // Destructor
-
-        ~lduMatrix();
+    //- Destructor
+    ~lduMatrix();
 
 
     // Member functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
index b0680fc5d4..2d1ff23a59 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
@@ -42,7 +42,7 @@ void Foam::lduMatrix::initMatrixInterfaces
      || Pstream::defaultCommsType == Pstream::nonBlocking
     )
     {
-        forAll (interfaces, interfaceI)
+        forAll(interfaces, interfaceI)
         {
             if (interfaces.set(interfaceI))
             {
@@ -117,7 +117,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
             OPstream::waitRequests();
         }
 
-        forAll (interfaces, interfaceI)
+        forAll(interfaces, interfaceI)
         {
             if (interfaces.set(interfaceI))
             {
@@ -138,7 +138,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
         const lduSchedule& patchSchedule = this->patchSchedule();
 
         // Loop over all the "normal" interfaces relating to standard patches
-        forAll (patchSchedule, i)
+        forAll(patchSchedule, i)
         {
             label interfaceI = patchSchedule[i].patch;
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
index e1260e0e2a..02d428ef49 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DICPreconditioner/DICPreconditioner.H
@@ -74,10 +74,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DICPreconditioner()
-        {}
+    //- Destructor
+    virtual ~DICPreconditioner()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
index 89d9200189..1988b68032 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.H
@@ -74,10 +74,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DILUPreconditioner()
-        {}
+    //- Destructor
+    virtual ~DILUPreconditioner()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
index 717d7fae84..7226d4a320 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.H
@@ -87,10 +87,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~FDICPreconditioner()
-        {}
+    //- Destructor
+    virtual ~FDICPreconditioner()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
index 5a30a2d1ee..01d2303317 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/GAMGPreconditioner/GAMGPreconditioner.H
@@ -79,9 +79,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GAMGPreconditioner();
+    //- Destructor
+    virtual ~GAMGPreconditioner();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
index 3edce1a953..b19265e2a5 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.H
@@ -84,10 +84,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~diagonalPreconditioner()
-        {}
+    //- Destructor
+    virtual ~diagonalPreconditioner()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
index 5792a0c2b5..f975846265 100644
--- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
+++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/noPreconditioner/noPreconditioner.H
@@ -75,10 +75,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~noPreconditioner()
-        {}
+    //- Destructor
+    virtual ~noPreconditioner()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
index 74e01d5fbc..7eaaef40ee 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/BICCG/BICCG.H
@@ -109,10 +109,9 @@ public:
             const scalar relTol = 0.0
         );
 
-    // Destructor
-
-        virtual ~BICCG()
-        {}
+    //- Destructor
+    virtual ~BICCG()
+    {}
 
 };
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index 78d1e07205..e39bb19b5a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -88,7 +88,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     label nCoarseFaces = 0;
 
     // Loop through all fine faces
-    forAll (upperAddr, fineFacei)
+    forAll(upperAddr, fineFacei)
     {
         label rmUpperAddr = restrictMap[upperAddr[fineFacei]];
         label rmLowerAddr = restrictMap[lowerAddr[fineFacei]];
@@ -174,7 +174,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
 
     label coarseFacei = 0;
 
-    forAll (cCellnFaces, cci)
+    forAll(cCellnFaces, cci)
     {
         label* cFaces = &cCellFaces[maxNnbrs*cci];
         label ccnFaces = cCellnFaces[cci];
@@ -223,7 +223,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     labelListList coarseInterfaceAddr(fineInterfaces.size());
 
     // Initialise transfer of restrict addressing on the interface
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
@@ -236,7 +236,7 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
     }
 
     // Add the coarse level
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index 1097f35b22..4431db24df 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -202,7 +202,7 @@ Foam::GAMGAgglomeration::~GAMGAgglomeration()
     {
         lduInterfacePtrsList& curLevel = interfaceLevels_[leveli];
 
-        forAll (curLevel, i)
+        forAll(curLevel, i)
         {
             if (curLevel.set(i))
             {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
index 2186b7839d..807477f411 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H
@@ -180,9 +180,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GAMGAgglomeration();
+    //- Destructor
+    ~GAMGAgglomeration();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 9129e62ae2..57d4bdcfa4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -48,18 +48,18 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
     {
         labelList nNbrs(nFineCells, 0);
 
-        forAll (upperAddr, facei)
+        forAll(upperAddr, facei)
         {
             nNbrs[upperAddr[facei]]++;
         }
 
-        forAll (lowerAddr, facei)
+        forAll(lowerAddr, facei)
         {
             nNbrs[lowerAddr[facei]]++;
         }
 
         cellFaceOffsets[0] = 0;
-        forAll (nNbrs, celli)
+        forAll(nNbrs, celli)
         {
             cellFaceOffsets[celli+1] = cellFaceOffsets[celli] + nNbrs[celli];
         }
@@ -67,7 +67,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
         // reset the whole list to use as counter
         nNbrs = 0;
 
-        forAll (upperAddr, facei)
+        forAll(upperAddr, facei)
         {
             cellFaces
             [
@@ -77,7 +77,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
             nNbrs[upperAddr[facei]]++;
         }
 
-        forAll (lowerAddr, facei)
+        forAll(lowerAddr, facei)
         {
             cellFaces
             [
@@ -187,7 +187,7 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
     // (doesn't always help and is sometimes detrimental)
     nCoarseCells--;
 
-    forAll (coarseCellMap, celli)
+    forAll(coarseCellMap, celli)
     {
         coarseCellMap[celli] = nCoarseCells - coarseCellMap[celli];
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
index 0d210f38f9..8e977a6a9b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerationCombineLevels.C
@@ -78,7 +78,7 @@ void Foam::pairGAMGAgglomeration::combineLevels(const label curLevel)
     const lduInterfacePtrsList& curInterLevel = interfaceLevels_[curLevel+1];
     lduInterfacePtrsList& prevInterLevel = interfaceLevels_[prevLevel+1];
 
-    forAll (prevInterLevel, inti)
+    forAll(prevInterLevel, inti)
     {
         if (prevInterLevel.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
index f63fad767d..7c87a765d4 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.C
@@ -127,11 +127,11 @@ Foam::GAMGSolver::GAMGSolver
 Foam::GAMGSolver::~GAMGSolver()
 {
     // Clear the the lists of pointers to the interfaces
-    forAll (interfaceLevels_, leveli)
+    forAll(interfaceLevels_, leveli)
     {
         lduInterfaceFieldPtrsList& curLevel = interfaceLevels_[leveli];
 
-        forAll (curLevel, i)
+        forAll(curLevel, i)
         {
             if (curLevel.set(i))
             {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
index baa2621ccb..54908a720d 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolver.H
@@ -223,9 +223,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GAMGSolver();
+    //- Destructor
+    virtual ~GAMGSolver();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 1516fb6894..7447c152cd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -91,7 +91,7 @@ void Foam::GAMGSolver::agglomerateMatrix(const label fineLevelIndex)
         interfaceLevelsIntCoeffs_[fineLevelIndex];
 
     // Add the coarse level
-    forAll (fineInterfaces, inti)
+    forAll(fineInterfaces, inti)
     {
         if (fineInterfaces.set(inti))
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
index efe3fbb1e5..2aae470a68 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C
@@ -377,7 +377,7 @@ void Foam::GAMGSolver::initVcycle
         )
     );
 
-    forAll (matrixLevels_, leveli)
+    forAll(matrixLevels_, leveli)
     {
         coarseCorrFields.set
         (
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
index 7ce417d51f..d1fba2a55e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.H
@@ -90,9 +90,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cyclicGAMGInterfaceField();
+    //- Destructor
+    virtual ~cyclicGAMGInterfaceField();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
index a4d94de447..1cdb4add61 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.H
@@ -90,9 +90,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~processorGAMGInterfaceField();
+    //- Destructor
+    virtual ~processorGAMGInterfaceField();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
index 0d4da4313b..5446a83e5e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterfaceTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type> > Foam::GAMGInterface::interfaceInternalField
     tmp<Field<Type> > tresult(new Field<Type>(size()));
     Field<Type>& result = tresult();
 
-    forAll (result, elemI)
+    forAll(result, elemI)
     {
         result[elemI] = iF[faceCells_[elemI]];
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 5971b5af3f..fa55f71e72 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -144,7 +144,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     nCoarseFaces = 0;
 
     // On master side, the owner addressing is stored in table of contents
-    forAll (contents, masterI)
+    forAll(contents, masterI)
     {
         SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -163,12 +163,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = contents[masterI];
 
-            for
-            (
-                SLList<label>::iterator facesIter = faceFacesIter().begin();
-                facesIter != faceFacesIter().end();
-                ++facesIter
-            )
+            forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
             {
                 faceRestrictAddressing_[facesIter()] = nCoarseFaces;
             }
@@ -178,7 +173,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     }
 
     // On slave side, the owner addressing is stored in linked lists
-    forAll (contents, masterI)
+    forAll(contents, masterI)
     {
         SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -197,12 +192,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
         {
             faceCells_[nCoarseFaces] = nbrsIter();
 
-            for
-            (
-                SLList<label>::iterator facesIter = faceFacesIter().begin();
-                facesIter != faceFacesIter().end();
-                ++facesIter
-            )
+            forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
             {
                 faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces;
             }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index 826ea3c438..d912cb313c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cyclicGAMGInterface();
+    //- Destructor
+    virtual ~cyclicGAMGInterface();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index d614355b55..1d79ac018e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -71,7 +71,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
 
     label nCoarseFaces = 0;
 
-    forAll (localRestrictAddressing, ffi)
+    forAll(localRestrictAddressing, ffi)
     {
         label curMaster = -1;
         label curSlave = -1;
@@ -159,7 +159,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     if (myProcNo() < neighbProcNo())
     {
         // On master side, the owner addressing is stored in table of contents
-        forAll (contents, masterI)
+        forAll(contents, masterI)
         {
             SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -180,12 +180,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = contents[masterI];
 
-                for
-                (
-                    SLList<label>::iterator facesIter = faceFacesIter().begin();
-                    facesIter != faceFacesIter().end();
-                    ++facesIter
-                )
+                forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
@@ -197,7 +192,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     else
     {
         // On slave side, the owner addressing is stored in linked lists
-        forAll (contents, masterI)
+        forAll(contents, masterI)
         {
             SLList<label>& curNbrs = neighboursTable.find(contents[masterI])();
 
@@ -218,12 +213,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             {
                 faceCells_[nCoarseFaces] = nbrsIter();
 
-                for
-                (
-                    SLList<label>::iterator facesIter = faceFacesIter().begin();
-                    facesIter != faceFacesIter().end();
-                    ++facesIter
-                )
+                forAllConstIter(SLList<label>, faceFacesIter(), facesIter)
                 {
                     faceRestrictAddressing_[facesIter()] = nCoarseFaces;
                 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index 4b6c5fef7d..6d24e82db0 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~processorGAMGInterface();
+    //- Destructor
+    virtual ~processorGAMGInterface();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
index 7d28367a3c..90f4245e8c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/ICCG/ICCG.H
@@ -108,10 +108,9 @@ public:
             const scalar relTol = 0.0
         );
 
-    // Destructor
-
-        virtual ~ICCG()
-        {}
+    //- Destructor
+    virtual ~ICCG()
+    {}
 
 };
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
index 9beac7f25b..a1753a1be1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PBiCG/PBiCG.H
@@ -80,10 +80,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~PBiCG()
-        {}
+    //- Destructor
+    virtual ~PBiCG()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
index 82b351342b..481ba0fe11 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/PCG/PCG.H
@@ -80,10 +80,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~PCG()
-        {}
+    //- Destructor
+    virtual ~PCG()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
index 4be4565bd0..616ffc7f26 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/smoothSolver/smoothSolver.H
@@ -85,10 +85,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~smoothSolver()
-        {}
+    //- Destructor
+    virtual ~smoothSolver()
+    {}
 
     // Member Functions
 
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index 44a1014717..786eee96c0 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -107,9 +107,8 @@ public:
         //- Construct by transferring the contents
         inline Xfer(const Xfer<T>&);
 
-    // Destructor
-
-        inline ~Xfer();
+    //- Destructor
+    inline ~Xfer();
 
     // Member Functions
 
diff --git a/src/OpenFOAM/memory/autoPtr/autoPtr.H b/src/OpenFOAM/memory/autoPtr/autoPtr.H
index 64dcd9d516..5f4afc765a 100644
--- a/src/OpenFOAM/memory/autoPtr/autoPtr.H
+++ b/src/OpenFOAM/memory/autoPtr/autoPtr.H
@@ -68,10 +68,8 @@ public:
         inline autoPtr(const autoPtr<T>&);
 
 
-    // Destructor
-
-        //- Delete object if pointer is not NULL
-        inline ~autoPtr();
+    //- Destructor, delete object if pointer is not NULL
+    inline ~autoPtr();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/memory/tmp/tmp.H b/src/OpenFOAM/memory/tmp/tmp.H
index 73fdb4a271..90fa6f5684 100644
--- a/src/OpenFOAM/memory/tmp/tmp.H
+++ b/src/OpenFOAM/memory/tmp/tmp.H
@@ -80,10 +80,8 @@ public:
         inline tmp(const tmp<T>&);
 
 
-    // Destructor
-
-        //- Delete object when reference count == 0
-        inline ~tmp();
+    //- Destructor, delete object when reference count == 0
+    inline ~tmp();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index acf8a79f6f..1a9811388a 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -48,13 +48,13 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
     label cellInOrder = 0;
 
     // reset the visited cells list
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         visited[cellI] = 0;
     }
 
     // loop over the cells
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         // find the first cell that has not been visited yet
         if (visited[cellI] == 0)
@@ -85,7 +85,7 @@ Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
                     const labelList& neighbours =
                         cellCellAddressing[currentCell];
 
-                    forAll (neighbours, nI)
+                    forAll(neighbours, nI)
                     {
                         if (visited[neighbours[nI]] == 0)
                         {
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
index 6a70f5c08c..2f03419fca 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H
@@ -59,10 +59,9 @@ public:
 
     // Constructors
 
-    // Destructor
-
-        virtual ~lduMesh()
-        {}
+    //- Destructor
+    virtual ~lduMesh()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index e0b51748c0..2eff97aa21 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -123,10 +123,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~lduPrimitiveMesh()
-        {}
+    //- Destructor
+    virtual ~lduPrimitiveMesh()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 080e968144..ab10b577f0 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -41,7 +41,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         maxVert += f[faces[faceI]].size();
     }
@@ -52,7 +52,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
     // in the first face there is no duplicates
     const labelList& first = f[faces[0]];
 
-    forAll (first, pointI)
+    forAll(first, pointI)
     {
         p[pointI] = first[pointI];
     }
@@ -67,7 +67,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const
     {
         const labelList& curFace = f[faces[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             const label curPoint = curFace[pointI];
 
@@ -126,7 +126,7 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
     // create a list of edges
     label maxNoEdges = 0;
 
-    forAll (curFaces, faceI)
+    forAll(curFaces, faceI)
     {
         maxNoEdges += f[curFaces[faceI]].nEdges();
     }
@@ -134,11 +134,11 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
     edgeList allEdges(maxNoEdges);
     label nEdges = 0;
 
-    forAll (curFaces, faceI)
+    forAll(curFaces, faceI)
     {
         const edgeList curFaceEdges = f[curFaces[faceI]].edges();
 
-        forAll (curFaceEdges, faceEdgeI)
+        forAll(curFaceEdges, faceEdgeI)
         {
             const edge& curEdge = curFaceEdges[faceEdgeI];
 
@@ -197,7 +197,7 @@ Foam::point Foam::cell::centre
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         scalar a = f[faces[faceI]].mag(p);
         cEst += f[faces[faceI]].centre(p)*a;
@@ -212,7 +212,7 @@ Foam::point Foam::cell::centre
 
     scalar sumV = 0;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         // calculate pyramid volume. If it is greater than zero, OK.
         // If not, the pyramid is inside-out. Create a face with the opposite
@@ -256,7 +256,7 @@ Foam::scalar Foam::cell::mag
 
     const labelList& faces = *this;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         cEst += f[faces[faceI]].centre(p);
         nCellFaces += 1;
@@ -267,7 +267,7 @@ Foam::scalar Foam::cell::mag
     // Calculate the magnitude by summing the mags of the pyramids
     scalar v = 0;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         v += ::Foam::mag(pyramidPointFaceRef(f[faces[faceI]], cEst).mag(p));
     }
@@ -288,13 +288,13 @@ bool Foam::operator==(const cell& a, const cell& b)
 
     List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         label curLabel = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLabel)
             {
@@ -313,7 +313,7 @@ bool Foam::operator==(const cell& a, const cell& b)
     // check if all faces on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
index 943686204e..f7b33d65df 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C
@@ -54,7 +54,7 @@ Foam::label Foam::cell::opposingFaceLabel
 
     label oppositeFaceLabel = -1;
 
-    forAll (curFaceLabels, faceI)
+    forAll(curFaceLabels, faceI)
     {
         // Compare the face with the master
         const face& curFace = meshFaces[curFaceLabels[faceI]];
@@ -70,11 +70,11 @@ Foam::label Foam::cell::opposingFaceLabel
 
             // Compare every vertex of the current face agains the
             // vertices of the master face
-            forAll (curFace, pointI)
+            forAll(curFace, pointI)
             {
                 const label l = curFace[pointI];
 
-                forAll (masterFace, masterPointI)
+                forAll(masterFace, masterPointI)
                 {
                     if (masterFace[masterPointI] == l)
                     {
@@ -149,11 +149,11 @@ Foam::oppositeFace Foam::cell::opposingFace
             oppFaceLabel
         );
 
-        forAll (masterFace, pointI)
+        forAll(masterFace, pointI)
         {
             // Go through the list of edges and find the edge from this vertex
             // to the slave face
-            forAll (e, edgeI)
+            forAll(e, edgeI)
             {
                 if (!usedEdges[edgeI])
                 {
@@ -166,7 +166,7 @@ Foam::oppositeFace Foam::cell::opposingFace
                         // Found an edge coming from this vertex.
                         // Check all vertices of the slave to find out
                         // if it exists.
-                        forAll (slaveFace, slavePointI)
+                        forAll(slaveFace, slavePointI)
                         {
                             if (slaveFace[slavePointI] == otherVertex)
                             {
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
index 55afe5c9e0..91454b95f4 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
@@ -123,14 +123,9 @@ Foam::label Foam::cellMatcher::calcLocalFaces
     }
 
     // Create local to global vertex mapping
-    for
-    (
-        Map<label>::iterator iter = localPoint_.begin();
-        iter != localPoint_.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, localPoint_, iter)
     {
-        label fp = iter();
+        const label fp = iter();
         pointMap_[fp] = iter.key();
     }
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
index ef5ffbbc63..96d3fe1674 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
@@ -196,10 +196,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cellMatcher()
-        {}
+    //- Destructor
+    virtual ~cellMatcher()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
index 7d86dba30e..0514c87dbd 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/hexMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct null
         hexMatcher();
 
-    // Destructor
-
-        ~hexMatcher();
+    //- Destructor
+    ~hexMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
index 11c7ec8a93..b56b494e0b 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/prismMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct
         prismMatcher();
 
-    // Destructor
-
-        ~prismMatcher();
+    //- Destructor
+    ~prismMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
index f245939f62..f58378ef32 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/pyrMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct null
         pyrMatcher();
 
-    // Destructor
-
-        ~pyrMatcher();
+    //- Destructor
+    ~pyrMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
index 5aca827cac..c1c51aef5e 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct null
         tetMatcher();
 
-    // Destructor
-
-        ~tetMatcher();
+    //- Destructor
+    ~tetMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
index 01bbd4446a..cf0cc0ecb8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/tetWedgeMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct null
         tetWedgeMatcher();
 
-    // Destructor
-
-        ~tetWedgeMatcher();
+    //- Destructor
+    ~tetWedgeMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
index e4cc57184f..d5ac9c1b50 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/wedgeMatcher.H
@@ -77,9 +77,8 @@ public:
         //- Construct null
         wedgeMatcher();
 
-    // Destructor
-
-        ~wedgeMatcher();
+    //- Destructor
+    ~wedgeMatcher();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
index f07b77e5f1..f47909cbc8 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
@@ -107,7 +107,7 @@ inline faceList cellModel::faces(const labelList& pointLabels) const
 
          curFace.setSize(curModelLabels.size());
 
-         forAll (curModelLabels, labelI)
+         forAll(curModelLabels, labelI)
          {
              curFace[labelI] = pointLabels[curModelLabels[labelI]];
          }
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
index 2df3c28636..565a8b90f3 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/cellModeller.H
@@ -71,9 +71,8 @@ public:
         //- Construct from central "cellModels" file
         cellModeller();
 
-    // Destructor
-
-        ~cellModeller();
+    //- Destructor
+    ~cellModeller();
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index 0f8829bd2e..84d90959a0 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -322,7 +322,7 @@ int Foam::face::compare(const face& a, const face& b)
     const label firstA = a[0];
     label Bptr = -1;
 
-    forAll (b, i)
+    forAll(b, i)
     {
         if (b[i] == firstA)
         {
@@ -621,7 +621,7 @@ Foam::label Foam::face::which(const label globalIndex) const
     label pointInFace = -1;
     const labelList& f = *this;
 
-    forAll (f, i)
+    forAll(f, i)
     {
         if (f[i] == globalIndex)
         {
@@ -750,7 +750,7 @@ Foam::edgeList Foam::face::edges() const
 
 int Foam::face::edgeDirection(const edge& e) const
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         if (operator[](i) == e.start())
         {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index ae6ca88f0e..3d587b74e1 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -43,7 +43,7 @@ Foam::scalar Foam::face::areaInContact
 
     scalarField vertexValue(labels.size());
 
-    forAll (labels, i)
+    forAll(labels, i)
     {
         vertexValue[i] = v[labels[i]];
     }
@@ -56,7 +56,7 @@ Foam::scalar Foam::face::areaInContact
     bool allPositive = true;
     bool allNegative = true;
 
-    forAll (vertexValue, vI)
+    forAll(vertexValue, vI)
     {
         if (vertexValue[vI] > 0)
         {
@@ -147,7 +147,7 @@ Foam::scalar Foam::face::areaInContact
     // Make a labelList for the sub-face (points are ordered!)
     labelList sfl(newFacePoints.size());
 
-    forAll (sfl, sflI)
+    forAll(sfl, sflI)
     {
         sfl[sflI] = sflI;
     }
diff --git a/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H b/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
index 0f7eff0b5f..2e333e6396 100644
--- a/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
+++ b/src/OpenFOAM/meshes/patchIdentifier/patchIdentifier.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~patchIdentifier();
+    //- Destructor
+    virtual ~patchIdentifier();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
index 00b97a17ab..b1655afa94 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointBoundaryMeshMapper.H
@@ -73,7 +73,7 @@ public:
         {
             const pointBoundaryMesh& patches = mesh.boundary();
 
-            forAll (patches, patchI)
+            forAll(patches, patchI)
             {
                 set
                 (
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index cc72dc0649..2624b84829 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -63,7 +63,7 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll (directAddr, pointI)
+        forAll(directAddr, pointI)
         {
             if (directAddr[pointI] < 0)
             {
@@ -89,7 +89,7 @@ void Foam::pointMapper::calcAddressing() const
         // Points created from other points (i.e. points merged into it).
         const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             // Get addressing
             const labelList& mo = cfc[cfcI].masterObjects();
@@ -115,7 +115,7 @@ void Foam::pointMapper::calcAddressing() const
 
         const labelList& cm = mpm_.pointMap();
 
-        forAll (cm, pointI)
+        forAll(cm, pointI)
         {
             if (cm[pointI] > -1 && addr[pointI].empty())
             {
@@ -132,7 +132,7 @@ void Foam::pointMapper::calcAddressing() const
 
         label nInsertedPoints = 0;
 
-        forAll (addr, pointI)
+        forAll(addr, pointI)
         {
             if (addr[pointI].empty())
             {
@@ -198,7 +198,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
 
         const List<objectMap>& cfc = mpm_.pointsFromPointsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             cm[cfc[cfcI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index 8130554309..af7a519e3c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -111,9 +111,8 @@ public:
         pointMapper(const pointMesh&, const mapPolyMesh& mpm);
 
 
-    // Destructor
-
-        virtual ~pointMapper();
+    //- Destructor
+    virtual ~pointMapper();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index 32954dd506..2171c0e49a 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -118,9 +118,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointPatchMapper();
+    //- Destructor
+    virtual ~pointPatchMapper();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
index 816020a756..1123e46ae6 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.H
@@ -95,9 +95,8 @@ public:
         coupledPointPatch(const pointBoundaryMesh& bm);
 
 
-    // Destructor
-
-        virtual ~coupledPointPatch();
+    //- Destructor
+    virtual ~coupledPointPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
index 91fdb1cf84..4b7090ae43 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.H
@@ -105,9 +105,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cyclicPointPatch();
+    //- Destructor
+    virtual ~cyclicPointPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
index 38efebd458..78d961cc48 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
@@ -62,7 +62,7 @@ void Foam::processorPointPatch::initGeometry(PstreamBuffers& pBufs)
 
     faceList masterFaces(pp.size());
 
-    forAll (pp, faceI)
+    forAll(pp, faceI)
     {
         masterFaces[faceI] = pp[faceI].reverseFace();
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
index 9cdb82b2e3..ef30fb27f2 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
@@ -110,9 +110,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~processorPointPatch();
+    //- Destructor
+    virtual ~processorPointPatch();
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
index 257a3fa5d7..7237290e04 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~coupledFacePointPatch();
+    //- Destructor
+    virtual ~coupledFacePointPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
index 7f1e6d2946..445eec1ec3 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/facePointPatch/facePointPatch.H
@@ -140,10 +140,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~facePointPatch()
-        {}
+    //- Destructor
+    virtual ~facePointPatch()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
index 482c10128f..76f04d1d12 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.H
@@ -120,10 +120,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~pointPatch()
-        {}
+    //- Destructor
+    virtual ~pointPatch()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 17c8254387..3931db5b6a 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -64,7 +64,7 @@ void Foam::globalMeshData::initProcAddr()
 
     label nNeighbours = 0;
 
-    forAll (mesh_.boundaryMesh(), patchi)
+    forAll(mesh_.boundaryMesh(), patchi)
     {
         if (isA<processorPolyPatch>(mesh_.boundaryMesh()[patchi]))
         {
@@ -78,7 +78,7 @@ void Foam::globalMeshData::initProcAddr()
     if (Pstream::parRun())
     {
         // Send indices of my processor patches to my neighbours
-        forAll (processorPatches_, i)
+        forAll(processorPatches_, i)
         {
             label patchi = processorPatches_[i];
 
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 79e086fd23..b3474ff050 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -362,9 +362,8 @@ public:
         globalMeshData(const IOobject& io, const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~globalMeshData();
+    //- Destructor
+    ~globalMeshData();
 
         //- Remove all demand driven data
         void clearOut();
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
index 7edd22308c..270be1dd77 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
@@ -1411,7 +1411,7 @@ void Foam::globalPoints::calculateSharedPoints
 
     // Sort procPoints in incremental order. This will make the master the
     // first element.
-    forAllIter(Map<label>, meshToProcPoint_, iter)
+    forAllConstIter(Map<label>, meshToProcPoint_, iter)
     {
         sort(procPoints_[iter()]);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 192b09d72f..0489d57ded 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -63,7 +63,7 @@ void Foam::cellMapper::calcAddressing() const
 
         label nInsertedCells = 0;
 
-        forAll (directAddr, cellI)
+        forAll(directAddr, cellI)
         {
             if (directAddr[cellI] < 0)
             {
@@ -88,7 +88,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
-        forAll (cfp, cfpI)
+        forAll(cfp, cfpI)
         {
             // Get addressing
             const labelList& mo = cfp[cfpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
 
-        forAll (cfe, cfeI)
+        forAll(cfe, cfeI)
         {
             // Get addressing
             const labelList& mo = cfe[cfeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cff = mpm_.cellsFromFacesMap();
 
-        forAll (cff, cffI)
+        forAll(cff, cffI)
         {
             // Get addressing
             const labelList& mo = cff[cffI].masterObjects();
@@ -154,7 +154,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             // Get addressing
             const labelList& mo = cfc[cfcI].masterObjects();
@@ -180,7 +180,7 @@ void Foam::cellMapper::calcAddressing() const
 
         const labelList& cm = mpm_.cellMap();
 
-        forAll (cm, cellI)
+        forAll(cm, cellI)
         {
             if (cm[cellI] > -1 && addr[cellI].empty())
             {
@@ -197,7 +197,7 @@ void Foam::cellMapper::calcAddressing() const
 
         label nInsertedCells = 0;
 
-        forAll (addr, cellI)
+        forAll(addr, cellI)
         {
             if (addr[cellI].empty())
             {
@@ -270,28 +270,28 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
 
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
-        forAll (cfp, cfpI)
+        forAll(cfp, cfpI)
         {
             cm[cfp[cfpI].index()] = 0;
         }
 
         const List<objectMap>& cfe = mpm_.cellsFromEdgesMap();
 
-        forAll (cfe, cfeI)
+        forAll(cfe, cfeI)
         {
             cm[cfe[cfeI].index()] = 0;
         }
 
         const List<objectMap>& cff = mpm_.cellsFromFacesMap();
 
-        forAll (cff, cffI)
+        forAll(cff, cffI)
         {
             cm[cff[cffI].index()] = 0;
         }
 
         const List<objectMap>& cfc = mpm_.cellsFromCellsMap();
 
-        forAll (cfc, cfcI)
+        forAll(cfc, cfcI)
         {
             cm[cfc[cfcI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index b2990b9de9..2406f182a1 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -112,9 +112,8 @@ public:
         cellMapper(const mapPolyMesh& mpm);
 
 
-    // Destructor
-
-        virtual ~cellMapper();
+    //- Destructor
+    virtual ~cellMapper();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index bbe15fbd30..a59d6f8fff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -63,7 +63,7 @@ void Foam::faceMapper::calcAddressing() const
 
         label nInsertedFaces = 0;
 
-        forAll (directAddr, faceI)
+        forAll(directAddr, faceI)
         {
             if (directAddr[faceI] < 0)
             {
@@ -88,7 +88,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& ffp = mpm_.facesFromPointsMap();
 
-        forAll (ffp, ffpI)
+        forAll(ffp, ffpI)
         {
             // Get addressing
             const labelList& mo = ffp[ffpI].masterObjects();
@@ -110,7 +110,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
 
-        forAll (ffe, ffeI)
+        forAll(ffe, ffeI)
         {
             // Get addressing
             const labelList& mo = ffe[ffeI].masterObjects();
@@ -132,7 +132,7 @@ void Foam::faceMapper::calcAddressing() const
 
         const List<objectMap>& fff = mpm_.facesFromFacesMap();
 
-        forAll (fff, fffI)
+        forAll(fff, fffI)
         {
             // Get addressing
             const labelList& mo = fff[fffI].masterObjects();
@@ -157,7 +157,7 @@ void Foam::faceMapper::calcAddressing() const
         // so check if addressing size still zero.
         const labelList& fm = mpm_.faceMap();
 
-        forAll (fm, faceI)
+        forAll(fm, faceI)
         {
             if (fm[faceI] > -1 && addr[faceI].empty())
             {
@@ -175,7 +175,7 @@ void Foam::faceMapper::calcAddressing() const
 
         label nInsertedFaces = 0;
 
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (addr[faceI].empty())
             {
@@ -247,21 +247,21 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
 
         const List<objectMap>& ffp = mpm_.facesFromPointsMap();
 
-        forAll (ffp, ffpI)
+        forAll(ffp, ffpI)
         {
             fm[ffp[ffpI].index()] = 0;
         }
 
         const List<objectMap>& ffe = mpm_.facesFromEdgesMap();
 
-        forAll (ffe, ffeI)
+        forAll(ffe, ffeI)
         {
             fm[ffe[ffeI].index()] = 0;
         }
 
         const List<objectMap>& fff = mpm_.facesFromFacesMap();
 
-        forAll (fff, fffI)
+        forAll(fff, fffI)
         {
             fm[fff[fffI].index()] = 0;
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 98c3b2149c..24a32d442e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -113,9 +113,8 @@ public:
         faceMapper(const mapPolyMesh& mpm);
 
 
-    // Destructor
-
-        virtual ~faceMapper();
+    //- Destructor
+    virtual ~faceMapper();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 18f5402428..b0ecac822b 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -371,9 +371,9 @@ Foam::mapDistribute::mapDistribute
             label i = 0;
             forAllIter(Map<label>, compactMap[procI], iter)
             {
+                const label compactI = compactStart[procI] + iter();
                 remoteElem[i] = iter.key();
-                label compactI = compactStart[procI]+iter();
-                localElem[i] = compactI;
+                localElem[i]  = compactI;
                 iter() = compactI;
                 i++;
             }
@@ -525,9 +525,9 @@ Foam::mapDistribute::mapDistribute
             label i = 0;
             forAllIter(Map<label>, compactMap[procI], iter)
             {
+                const label compactI = compactStart[procI] + iter();
                 remoteElem[i] = iter.key();
-                label compactI = compactStart[procI]+iter();
-                localElem[i] = compactI;
+                localElem[i]  = compactI;
                 iter() = compactI;
                 i++;
             }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
index 07e6f46229..d9f35e51e8 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/morphFieldMapper.H
@@ -58,10 +58,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~morphFieldMapper()
-        {}
+    //- Destructor
+    virtual ~morphFieldMapper()
+    {}
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 9cd769422d..1c351ab61d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -120,7 +120,7 @@ Foam::polyBoundaryMesh::~polyBoundaryMesh()
 
 void Foam::polyBoundaryMesh::clearGeom()
 {
-    forAll (*this, patchi)
+    forAll(*this, patchi)
     {
         operator[](patchi).clearGeom();
     }
@@ -132,7 +132,7 @@ void Foam::polyBoundaryMesh::clearAddressing()
     neighbourEdgesPtr_.clear();
     patchIDPtr_.clear();
 
-    forAll (*this, patchi)
+    forAll(*this, patchi)
     {
         operator[](patchi).clearAddressing();
     }
@@ -355,7 +355,7 @@ Foam::wordList Foam::polyBoundaryMesh::names() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].name();
     }
@@ -370,7 +370,7 @@ Foam::wordList Foam::polyBoundaryMesh::types() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].type();
     }
@@ -385,7 +385,7 @@ Foam::wordList Foam::polyBoundaryMesh::physicalTypes() const
 
     wordList t(patches.size());
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         t[patchI] = patches[patchI].physicalType();
     }
@@ -398,7 +398,7 @@ Foam::label Foam::polyBoundaryMesh::findPatchID(const word& patchName) const
 {
     const polyPatchList& patches = *this;
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         if (patches[patchI].name() == patchName)
         {
@@ -440,7 +440,7 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
         return -1;
     }
 
-    forAll (*this, patchI)
+    forAll(*this, patchI)
     {
         const polyPatch& bp = operator[](patchI);
 
@@ -518,7 +518,7 @@ bool Foam::polyBoundaryMesh::checkParallelSync(const bool report) const
 
     label nonProcI = 0;
 
-    forAll (bm, patchI)
+    forAll(bm, patchI)
     {
         if (!isA<processorPolyPatch>(bm[patchI]))
         {
@@ -594,7 +594,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const
 
     bool hasError = false;
 
-    forAll (bm, patchI)
+    forAll(bm, patchI)
     {
         if (bm[patchI].start() != nextPatchStart && !hasError)
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 6b843ecc90..8fa0eca534 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -116,9 +116,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~polyBoundaryMesh();
+    //- Destructor
+    ~polyBoundaryMesh();
 
         //- Clear geometry at this level and at patches
         void clearGeom();
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index b459de044e..9bb7f27fa5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -438,7 +438,7 @@ Foam::polyMesh::polyMesh
     oldPointsPtr_(NULL)
 {
     // Check if the faces and cells are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -594,7 +594,7 @@ Foam::polyMesh::polyMesh
     oldPointsPtr_(NULL)
 {
     // Check if faces are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -619,7 +619,7 @@ Foam::polyMesh::polyMesh
     cellList cLst(cells);
 
     // Check if cells are valid
-    forAll (cLst, cellI)
+    forAll(cLst, cellI)
     {
         const cell& curCell = cLst[cellI];
 
@@ -701,7 +701,7 @@ void Foam::polyMesh::resetPrimitives
     setInstance(time().timeName());
 
     // Check if the faces and cells are valid
-    forAll (faces_, faceI)
+    forAll(faces_, faceI)
     {
         const face& curFace = faces_[faceI];
 
@@ -866,7 +866,7 @@ void Foam::polyMesh::addPatches
     boundary_.setSize(p.size());
 
     // Copy the patch pointers
-    forAll (p, pI)
+    forAll(p, pI)
     {
         boundary_.set(pI, p[pI]);
     }
@@ -918,7 +918,7 @@ void Foam::polyMesh::addZones
         pointZones_.setSize(pz.size());
 
         // Copy the zone pointers
-        forAll (pz, pI)
+        forAll(pz, pI)
         {
             pointZones_.set(pI, pz[pI]);
         }
@@ -932,7 +932,7 @@ void Foam::polyMesh::addZones
         faceZones_.setSize(fz.size());
 
         // Copy the zone pointers
-        forAll (fz, fI)
+        forAll(fz, fI)
         {
             faceZones_.set(fI, fz[fI]);
         }
@@ -946,7 +946,7 @@ void Foam::polyMesh::addZones
         cellZones_.setSize(cz.size());
 
         // Copy the zone pointers
-        forAll (cz, cI)
+        forAll(cz, cI)
         {
             cellZones_.set(cI, cz[cI]);
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.H b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
index 38f521c264..ce82d36de7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -256,9 +256,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~polyMesh();
+    //- Destructor
+    virtual ~polyMesh();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
index d4fc6a8079..88fc61fe13 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -62,7 +62,7 @@ void Foam::polyMesh::clearGeom()
 
     primitiveMesh::clearGeom();
 
-    forAll (boundary_, patchI)
+    forAll(boundary_, patchI)
     {
         boundary_[patchI].clearGeom();
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
index 4fd9c4626a..464ed465b0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
@@ -61,7 +61,7 @@ Foam::labelListList Foam::polyMesh::cellShapePointCells
 
     labelListList pointCellAddr(pc.size());
 
-    forAll (pc, pointI)
+    forAll(pc, pointI)
     {
         pointCellAddr[pointI].transfer(pc[pointI]);
     }
@@ -384,7 +384,7 @@ Foam::polyMesh::polyMesh
             label nextNei = -1;
             label minNei = cells.size();
 
-            forAll (neiCells, ncI)
+            forAll(neiCells, ncI)
             {
                 if (neiCells[ncI] > -1 && neiCells[ncI] < minNei)
                 {
@@ -433,7 +433,7 @@ Foam::polyMesh::polyMesh
     labelList patchSizes(boundaryFaces.size(), -1);
     labelList patchStarts(boundaryFaces.size(), -1);
 
-    forAll (boundaryFaces, patchI)
+    forAll(boundaryFaces, patchI)
     {
         const faceList& patchFaces = boundaryFaces[patchI];
 
@@ -449,7 +449,7 @@ Foam::polyMesh::polyMesh
         // Grab the start label
         label curPatchStart = nFaces;
 
-        forAll (patchFaces, faceI)
+        forAll(patchFaces, faceI)
         {
             const face& curFace = patchFaces[faceI];
 
@@ -462,7 +462,7 @@ Foam::polyMesh::polyMesh
 
             bool found = false;
 
-            forAll (facesOfCellInside, cellFaceI)
+            forAll(facesOfCellInside, cellFaceI)
             {
                 if (facesOfCellInside[cellFaceI] == curFace)
                 {
@@ -541,7 +541,7 @@ Foam::polyMesh::polyMesh
 
     // Warning: Patches can only be added once the face list is
     // completed, as they hold a subList of the face list
-    forAll (boundaryFaces, patchI)
+    forAll(boundaryFaces, patchI)
     {
         // add the patch to the list
         boundary_.set
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index 9c437bdaaa..5dcb2464c7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -185,7 +185,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             wordList oldTypes = boundary_.types();
             wordList oldNames = boundary_.names();
 
-            forAll (oldTypes, patchI)
+            forAll(oldTypes, patchI)
             {
                 if
                 (
@@ -208,14 +208,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             boundary_.clear();
             boundary_.setSize(newBoundary.size());
 
-            forAll (newBoundary, patchI)
+            forAll(newBoundary, patchI)
             {
                 boundary_.set(patchI, newBoundary[patchI].clone(boundary_));
             }
         }
         else
         {
-            forAll (boundary_, patchI)
+            forAll(boundary_, patchI)
             {
                 boundary_[patchI] = polyPatch
                 (
@@ -296,7 +296,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (pointZones_, czI)
+        forAll(pointZones_, czI)
         {
             pointZones_[czI] = newPointZones[czI];
         }
@@ -333,7 +333,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (faceZones_, fzI)
+        forAll(faceZones_, fzI)
         {
             faceZones_[fzI].resetAddressing
             (
@@ -374,7 +374,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
         }
 
         // Reset existing ones
-        forAll (cellZones_, czI)
+        forAll(cellZones_, czI)
         {
             cellZones_[czI] = newCellZones[czI];
         }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
index 97bf542371..f732de64b2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshInitMesh.C
@@ -111,7 +111,7 @@ void Foam::polyMesh::initMesh(cellList& c)
         // get reference to face labels for current cell
         const labelList& cellfaces = c[cellI];
 
-        forAll (cellfaces, faceI)
+        forAll(cellfaces, faceI)
         {
             if (!markedFaces[cellfaces[faceI]])
             {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index fee9dc2da7..26b892921e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -308,7 +308,7 @@ void Foam::coupledPolyPatch::calcTransformTensors
             collocated_.setSize(Cf.size());
             collocated_ = false;
 
-            forAll (forwardT_, facei)
+            forAll(forwardT_, facei)
             {
                 forwardT_[facei] = rotationTensor(-nr[facei], nf[facei]);
                 reverseT_[facei] = rotationTensor(nf[facei], -nr[facei]);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index f564639014..423a94ccb7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -234,9 +234,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~coupledPolyPatch();
+    //- Destructor
+    virtual ~coupledPolyPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 8c0d66de3f..ba2067b907 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -123,12 +123,7 @@ void Foam::genericPolyPatch::write(Ostream& os) const
     os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
     os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if
         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
index 567ffc5c89..b06a95c279 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
@@ -154,9 +154,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~genericPolyPatch();
+    //- Destructor
+    ~genericPolyPatch();
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 94244cdc01..f8ae312f20 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -283,9 +283,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~cyclicPolyPatch();
+    //- Destructor
+    virtual ~cyclicPolyPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index c4bcd7398a..8b168b9806 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -217,9 +217,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~processorPolyPatch();
+    //- Destructor
+    virtual ~processorPolyPatch();
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index fa35e02e76..37fa6df999 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -275,7 +275,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
 
     const unallocLabelList& faceCells = this->faceCells();
 
-    forAll (faceCells, facei)
+    forAll(faceCells, facei)
     {
         cc[facei] = gcc[faceCells[facei]];
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index fb3f45045b..f9cbfcad9a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -276,9 +276,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~polyPatch();
+    //- Destructor
+    virtual ~polyPatch();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 16a0ef72bf..3591eac756 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -201,12 +201,7 @@ void Foam::syncTools::syncPointMap
 
                 // Only update those values which come from neighbour
 
-                forAllConstIter
-                (
-                    typename Map<T>,
-                    nbrPatchInfo,
-                    nbrIter
-                )
+                forAllConstIter(typename Map<T>, nbrPatchInfo, nbrIter)
                 {
                     combine
                     (
@@ -550,12 +545,7 @@ void Foam::syncTools::syncEdgeMap
 
                 // Only update those values which come from neighbour
 
-                forAllConstIter
-                (
-                    typename EdgeMap<T>,
-                    nbrPatchInfo,
-                    nbrIter
-                )
+                forAllConstIter(typename EdgeMap<T>, nbrPatchInfo, nbrIter)
                 {
                     const edge& e = nbrIter.key();
                     const edge meshEdge(meshPts[e[0]], meshPts[e[1]]);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
index 546c4bef1a..7ad51549b1 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C
@@ -50,7 +50,7 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
         // Count number of objects in all zones
         label nObjects = 0;
 
-        forAll (*this, zoneI)
+        forAll(*this, zoneI)
         {
             nObjects += this->operator[](zoneI).size();
         }
@@ -60,11 +60,11 @@ void ZoneMesh<ZoneType, MeshType>::calcZoneMap() const
 
         // Fill in objects of all zones into the map.  The key is the global
         // object index and the result is the zone index
-        forAll (*this, zoneI)
+        forAll(*this, zoneI)
         {
             const labelList& zoneObjects = this->operator[](zoneI);
 
-            forAll (zoneObjects, objI)
+            forAll(zoneObjects, objI)
             {
                 zm.insert(zoneObjects[objI], zoneI);
             }
@@ -201,7 +201,7 @@ wordList ZoneMesh<ZoneType, MeshType>::types() const
 
     wordList t(zones.size());
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         t[zoneI] = zones[zoneI].type();
     }
@@ -218,7 +218,7 @@ wordList ZoneMesh<ZoneType, MeshType>::names() const
 
     wordList t(zones.size());
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         t[zoneI] = zones[zoneI].name();
     }
@@ -232,7 +232,7 @@ label ZoneMesh<ZoneType, MeshType>::findZoneID(const word& zoneName) const
 {
     const PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         if (zones[zoneI].name() == zoneName)
         {
@@ -261,7 +261,7 @@ void ZoneMesh<ZoneType, MeshType>::clearAddressing()
 
     PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         zones[zoneI].clearAddressing();
     }
@@ -284,7 +284,7 @@ bool ZoneMesh<ZoneType, MeshType>::checkDefinition(const bool report) const
 
     const PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         inError |= zones[zoneI].checkDefinition(report);
     }
@@ -298,7 +298,7 @@ void ZoneMesh<ZoneType, MeshType>::movePoints(const pointField& p)
 {
     PtrList<ZoneType>& zones = *this;
 
-    forAll (zones, zoneI)
+    forAll(zones, zoneI)
     {
         zones[zoneI].movePoints(p);
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
index 57404af320..ca1a2dce86 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
@@ -105,9 +105,8 @@ public:
             const label size
         );
 
-    // Destructor
-
-        ~ZoneMesh();
+    //- Destructor
+    ~ZoneMesh();
 
 
     // Member functions
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 5e900f8fed..8c5b79e80a 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -77,7 +77,7 @@ void Foam::faceZone::calcFaceZonePatch() const
     const labelList& addr = *this;
     const boolList& flip = flipMap();
 
-    forAll (addr, faceI)
+    forAll(addr, faceI)
     {
         if (flip[faceI])
         {
@@ -133,7 +133,7 @@ void Foam::faceZone::calcCellLayers() const
         slaveCellsPtr_ = new labelList(mf.size());
         labelList& sc = *slaveCellsPtr_;
 
-        forAll (mf, faceI)
+        forAll(mf, faceI)
         {
             label ownCellI = own[mf[faceI]];
             label neiCellI =
@@ -346,7 +346,7 @@ const Foam::labelList& Foam::faceZone::meshEdges() const
         //
         //const labelList& faceLabels = *this;
         //
-        //forAll (faceCells, faceI)
+        //forAll(faceCells, faceI)
         //{
         //    faceCells[faceI] = own[faceLabels[faceI]];
         //}
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index 2d0515addd..6561705652 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -258,9 +258,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~PrimitivePatch();
+    //- Destructor
+    virtual ~PrimitivePatch();
 
         void clearOut();
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 9c3d10619d..8722ab98ac 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -78,7 +78,7 @@ calcAddressing() const
 
     // Guess the max number of edges and neighbours for a face
     label maxEdges = 0;
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         maxEdges += locFcs[faceI].size();
     }
@@ -103,14 +103,14 @@ calcAddressing() const
     // initialise the lists of subshapes for each face to avoid duplication
     edgeListList faceIntoEdges(locFcs.size());
 
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         faceIntoEdges[faceI] = locFcs[faceI].edges();
 
         labelList& curFaceEdges = faceEdges[faceI];
         curFaceEdges.setSize(faceIntoEdges[faceI].size());
 
-        forAll (curFaceEdges, faceEdgeI)
+        forAll(curFaceEdges, faceEdgeI)
         {
             curFaceEdges[faceEdgeI] = -1;
         }
@@ -128,7 +128,7 @@ calcAddressing() const
     // in face (i.e. curEdges[0] is edge between f[0] and f[1])
 
     // For all local faces ...
-    forAll (locFcs, faceI)
+    forAll(locFcs, faceI)
     {
         // Get reference to vertices of current face and corresponding edges.
         const Face& curF = locFcs[faceI];
@@ -141,7 +141,7 @@ calcAddressing() const
         label nNeighbours = 0;
 
         // For all edges ...
-        forAll (curEdges, edgeI)
+        forAll(curEdges, edgeI)
         {
             // If the edge is already detected, skip
             if (faceEdges[faceI][edgeI] >= 0) continue;
@@ -155,7 +155,7 @@ calcAddressing() const
 
             const labelList& nbrFaces = pf[e.start()];
 
-            forAll (nbrFaces, nbrFaceI)
+            forAll(nbrFaces, nbrFaceI)
             {
                 // set reference to the current neighbour
                 label curNei = nbrFaces[nbrFaceI];
@@ -166,7 +166,7 @@ calcAddressing() const
                     // get the reference to subshapes of the neighbour
                     const edgeList& searchEdges = faceIntoEdges[curNei];
 
-                    forAll (searchEdges, neiEdgeI)
+                    forAll(searchEdges, neiEdgeI)
                     {
                         if (searchEdges[neiEdgeI] == e)
                         {
@@ -204,7 +204,7 @@ calcAddressing() const
             label nextNei = -1;
             label minNei = locFcs.size();
 
-            forAll (neiFaces, nfI)
+            forAll(neiFaces, nfI)
             {
                 if (neiFaces[nfI].size() && neiFaces[nfI][0] < minNei)
                 {
@@ -229,7 +229,7 @@ calcAddressing() const
                 curEf.setSize(cnf.size() + 1);
                 curEf[0] = faceI;
 
-                forAll (cnf, cnfI)
+                forAll(cnf, cnfI)
                 {
                     faceEdges[cnf[cnfI]][eonf[cnfI]] = nEdges;
 
@@ -259,11 +259,11 @@ calcAddressing() const
 
     // Do boundary faces
 
-    forAll (faceEdges, faceI)
+    forAll(faceEdges, faceI)
     {
         labelList& curEdges = faceEdges[faceI];
 
-        forAll (curEdges, edgeI)
+        forAll(curEdges, edgeI)
         {
             if (curEdges[edgeI] < 0)
             {
@@ -291,7 +291,7 @@ calcAddressing() const
     faceFacesPtr_ = new labelListList(locFcs.size());
     labelListList& faceFaces = *faceFacesPtr_;
 
-    forAll (faceFaces, faceI)
+    forAll(faceFaces, faceI)
     {
         faceFaces[faceI].transfer(ff[faceI]);
     }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 5e7cc45fa4..d9d1239a81 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -80,7 +80,7 @@ calcLocalPointOrder() const
 
     label nPoints = 0;
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         if (!visitedFace[faceI])
         {
@@ -99,7 +99,7 @@ calcLocalPointOrder() const
                     const labelList& curPoints = lf[curFace];
 
                     // mark points
-                    forAll (curPoints, pointI)
+                    forAll(curPoints, pointI)
                     {
                         if (!visitedPoint[curPoints[pointI]])
                         {
@@ -114,7 +114,7 @@ calcLocalPointOrder() const
                     // add face neighbours to the list
                     const labelList& nbrs = ff[curFace];
 
-                    forAll (nbrs, nbrI)
+                    forAll(nbrs, nbrI)
                     {
                         if (!visitedFace[nbrs[nbrI]])
                         {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
index 66661c3f76..480cb3402b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchMeshEdges.C
@@ -67,7 +67,7 @@ meshEdges
 
     // WARNING: Remember that local edges address into local point list;
     // local-to-global point label translation is necessary
-    forAll (PatchEdges, edgeI)
+    forAll(PatchEdges, edgeI)
     {
         const edge curEdge
             (pp[PatchEdges[edgeI].start()], pp[PatchEdges[edgeI].end()]);
@@ -77,7 +77,7 @@ meshEdges
         // get the patch faces sharing the edge
         const labelList& curFaces = EdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // get the cell next to the face
             label curCell = faceCells[curFaces[faceI]];
@@ -85,7 +85,7 @@ meshEdges
             // get reference to edges on the cell
             const labelList& ce = cellEdges[curCell];
 
-            forAll (ce, cellEdgeI)
+            forAll(ce, cellEdgeI)
             {
                 if (allEdges[ce[cellEdgeI]] == curEdge)
                 {
@@ -139,14 +139,14 @@ meshEdges
 
     // WARNING: Remember that local edges address into local point list;
     // local-to-global point label translation is necessary
-    forAll (PatchEdges, edgeI)
+    forAll(PatchEdges, edgeI)
     {
         const label globalPointI = pp[PatchEdges[edgeI].start()];
         const edge curEdge(globalPointI, pp[PatchEdges[edgeI].end()]);
 
         const labelList& pe = pointEdges[globalPointI];
 
-        forAll (pe, i)
+        forAll(pe, i)
         {
             if (allEdges[pe[i]] == curEdge)
             {
@@ -183,7 +183,7 @@ whichEdge
     {
         const labelList& pe = pointEdges()[e.start()];
 
-        forAll (pe, peI)
+        forAll(pe, peI)
         {
             if (e == Edges[pe[peI]])
             {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
index f73eae1221..5f9805ef54 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
@@ -67,7 +67,7 @@ calcPointEdges() const
     // set up storage for pointEdges
     List<SLList<label> > pointEdges(meshPoints().size());
 
-    forAll (e, edgeI)
+    forAll(e, edgeI)
     {
         pointEdges[e[edgeI].start()].append(edgeI);
         pointEdges[e[edgeI].end()].append(edgeI);
@@ -78,19 +78,16 @@ calcPointEdges() const
 
     labelListList& pe = *pointEdgesPtr_;
 
-    forAll (pointEdges, pointI)
+    forAll(pointEdges, pointI)
     {
-        pe[pointI].setSize(pointEdges[pointI].size());
+        const SLList<label>& pEdge = pointEdges[pointI];
+
+        pe[pointI].setSize(pEdge.size());
 
         label i = 0;
-        for
-        (
-            SLList<label>::iterator curEdgesIter = pointEdges[pointI].begin();
-            curEdgesIter != pointEdges[pointI].end();
-            ++curEdgesIter, ++i
-        )
+        forAllConstIter(SLList<label>, pEdge, iter)
         {
-            pe[pointI][i] = curEdgesIter();
+            pe[pointI][i++] = iter();
         }
     }
 
@@ -138,11 +135,11 @@ calcPointFaces() const
     // set up storage for pointFaces
     List<SLList<label> > pointFcs(meshPoints().size());
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         const Face& curPoints = f[faceI];
 
-        forAll (curPoints, pointI)
+        forAll(curPoints, pointI)
         {
             pointFcs[curPoints[pointI]].append(faceI);
         }
@@ -153,19 +150,14 @@ calcPointFaces() const
 
     labelListList& pf = *pointFacesPtr_;
 
-    forAll (pointFcs, pointI)
+    forAll(pointFcs, pointI)
     {
         pf[pointI].setSize(pointFcs[pointI].size());
 
         label i = 0;
-        for
-        (
-            SLList<label>::iterator curFacesIter = pointFcs[pointI].begin();
-            curFacesIter != pointFcs[pointI].end();
-            ++curFacesIter, ++i
-        )
+        forAllIter(SLList<label>, pointFcs[pointI], curFacesIter)
         {
-            pf[pointI][i] = curFacesIter();
+            pf[pointI][i++] = curFacesIter();
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index d58231f7ec..a3522bbf83 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -84,7 +84,7 @@ projectPoints
     // Estimate face centre of target side
     Field<PointType> masterFaceCentres(targetPatch.size());
 
-    forAll (masterFaceCentres, faceI)
+    forAll(masterFaceCentres, faceI)
     {
         masterFaceCentres[faceI] =
             average(masterFaces[faceI].points(masterPoints));
@@ -101,7 +101,7 @@ projectPoints
     label curFace = 0;
     label nNSquaredSearches = 0;
 
-    forAll (slavePointOrder, pointI)
+    forAll(slavePointOrder, pointI)
     {
         // Pick up slave point and direction
         const label curLocalPointLabel = slavePointOrder[pointI];
@@ -179,7 +179,7 @@ projectPoints
                     sqrDistance =
                         magSqr(missPlanePoint - masterFaceCentres[curFace]);
 
-                    forAll (masterNbrs, nbrI)
+                    forAll(masterNbrs, nbrI)
                     {
                         if
                         (
@@ -224,7 +224,7 @@ projectPoints
             result[curLocalPointLabel] = objectHit(false, -1);
             scalar minDistance = GREAT;
 
-            forAll (masterFaces, faceI)
+            forAll(masterFaces, faceI)
             {
                 PointHit<PointType> curHit =
                     masterFaces[faceI].ray
@@ -325,7 +325,7 @@ projectFaceCentres
 
     const typename ToPatch::PointFieldType& masterPoints = targetPatch.points();
 
-    forAll (masterFaceCentres, faceI)
+    forAll(masterFaceCentres, faceI)
     {
         masterFaceCentres[faceI] =
             masterFaces[faceI].centre(masterPoints);
@@ -348,7 +348,7 @@ projectFaceCentres
     label curFace = 0;
     label nNSquaredSearches = 0;
 
-    forAll (slaveFaceOrder, faceI)
+    forAll(slaveFaceOrder, faceI)
     {
         // pick up slave point and direction
         const label curLocalFaceLabel = slaveFaceOrder[faceI];
@@ -425,7 +425,7 @@ projectFaceCentres
 
                     const labelList& masterNbrs = masterFaceFaces[curFace];
 
-                    forAll (masterNbrs, nbrI)
+                    forAll(masterNbrs, nbrI)
                     {
                         if
                         (
@@ -467,7 +467,7 @@ projectFaceCentres
             result[curLocalFaceLabel] = objectHit(false, -1);
             scalar minDistance = GREAT;
 
-            forAll (masterFaces, faceI)
+            forAll(masterFaces, faceI)
             {
                 PointHit<PointType> curHit =
                     masterFaces[faceI].ray
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index 718df480e0..4b78927de0 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -350,9 +350,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~primitiveMesh();
+    //- Destructor
+    virtual ~primitiveMesh();
 
 
     // Member Functions
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
index d72ae8526e..803160e8be 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCalcCellShapes.C
@@ -49,7 +49,7 @@ void Foam::primitiveMesh::calcCellShapes() const
         cellShapesPtr_ = new cellShapeList(nCells());
         cellShapeList& cellShapes = *cellShapesPtr_;
 
-        forAll (cellShapes, celli)
+        forAll(cellShapes, celli)
         {
             cellShapes[celli] = degenerateMatcher::match(*this, celli);
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index e4486bb637..a698a80833 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -63,7 +63,7 @@ void Foam::primitiveMesh::calcCellCells() const
         const labelList& own = faceOwner();
         const labelList& nei = faceNeighbour();
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             ncc[own[faceI]]++;
             ncc[nei[faceI]]++;
@@ -77,13 +77,13 @@ void Foam::primitiveMesh::calcCellCells() const
 
         // 2. Size and fill cellFaceAddr
 
-        forAll (cellCellAddr, cellI)
+        forAll(cellCellAddr, cellI)
         {
             cellCellAddr[cellI].setSize(ncc[cellI]);
         }
         ncc = 0;
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             label ownCellI = own[faceI];
             label neiCellI = nei[faceI];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 0d49452c0d..fd38491dfa 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -90,13 +90,13 @@ void Foam::primitiveMesh::makeCellCentresAndVols
     vectorField cEst(nCells(), vector::zero);
     labelField nCellFaces(nCells(), 0);
 
-    forAll (own, facei)
+    forAll(own, facei)
     {
         cEst[own[facei]] += fCtrs[facei];
         nCellFaces[own[facei]] += 1;
     }
 
-    forAll (nei, facei)
+    forAll(nei, facei)
     {
         cEst[nei[facei]] += fCtrs[facei];
         nCellFaces[nei[facei]] += 1;
@@ -107,7 +107,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
         cEst[celli] /= nCellFaces[celli];
     }
 
-    forAll (own, facei)
+    forAll(own, facei)
     {
         // Calculate 3*face-pyramid volume
         scalar pyr3Vol =
@@ -123,7 +123,7 @@ void Foam::primitiveMesh::makeCellCentresAndVols
         cellVols[own[facei]] += pyr3Vol;
     }
 
-    forAll (nei, facei)
+    forAll(nei, facei)
     {
         // Calculate 3*face-pyramid volume
         scalar pyr3Vol =
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
index 08d3c6c5b5..98cec1c337 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellEdges.C
@@ -69,13 +69,13 @@ void Foam::primitiveMesh::calcCellEdges() const
         const labelListList& fe = faceEdges();
 
         // loop through the list again and add edges; checking for duplicates
-        forAll (own, faceI)
+        forAll(own, faceI)
         {
             DynamicList<label, edgesPerCell_>& curCellEdges = ce[own[faceI]];
 
             const labelList& curEdges = fe[faceI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
                 {
@@ -85,13 +85,13 @@ void Foam::primitiveMesh::calcCellEdges() const
             }
         }
 
-        forAll (nei, faceI)
+        forAll(nei, faceI)
         {
             DynamicList<label, edgesPerCell_>& curCellEdges = ce[nei[faceI]];
 
             const labelList& curEdges = fe[faceI];
 
-            forAll (curEdges, edgeI)
+            forAll(curEdges, edgeI)
             {
                 if (findIndex(curCellEdges, curEdges[edgeI]) == -1)
                 {
@@ -105,7 +105,7 @@ void Foam::primitiveMesh::calcCellEdges() const
         labelListList& cellEdgeAddr = *cePtr_;
 
         // reset the size
-        forAll (ce, cellI)
+        forAll(ce, cellI)
         {
             cellEdgeAddr[cellI].transfer(ce[cellI]);
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index a117022bb0..f814bd1eef 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -52,12 +52,12 @@ void Foam::primitiveMesh::calcCells
 
     labelList ncf(nCells, 0);
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         ncf[own[faceI]]++;
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         if (nei[faceI] >= 0)
         {
@@ -71,20 +71,20 @@ void Foam::primitiveMesh::calcCells
 
     // 2. Size and fill cellFaceAddr
 
-    forAll (cellFaceAddr, cellI)
+    forAll(cellFaceAddr, cellI)
     {
         cellFaceAddr[cellI].setSize(ncf[cellI]);
     }
     ncf = 0;
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         label cellI = own[faceI];
 
         cellFaceAddr[cellI][ncf[cellI]++] = faceI;
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         label cellI = nei[faceI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index f28e9affd0..b60caa78d2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -113,7 +113,7 @@ bool Foam::primitiveMesh::checkClosedCells
 
     label nErrorClosed = 0;
 
-    forAll (c, cI)
+    forAll(c, cI)
     {
         const cell& curCell = c[cI];
 
@@ -149,14 +149,14 @@ bool Foam::primitiveMesh::checkClosedCells
     const labelList& nei = faceNeighbour();
     const vectorField& areas = faceAreas();
 
-    forAll (own, faceI)
+    forAll(own, faceI)
     {
         // Add to owner
         sumClosed[own[faceI]] += areas[faceI];
         sumMagClosed[own[faceI]] += cmptMag(areas[faceI]);
     }
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         // Subtract from neighbour
         sumClosed[nei[faceI]] -= areas[faceI];
@@ -172,7 +172,7 @@ bool Foam::primitiveMesh::checkClosedCells
     const scalarField& vols = cellVolumes();
 
     // Check the sums
-    forAll (sumClosed, cellI)
+    forAll(sumClosed, cellI)
     {
         scalar maxOpenness = 0;
 
@@ -281,7 +281,7 @@ bool Foam::primitiveMesh::checkFaceAreas
     scalar minArea = GREAT;
     scalar maxArea = -GREAT;
 
-    forAll (magFaceAreas, faceI)
+    forAll(magFaceAreas, faceI)
     {
         if (magFaceAreas[faceI] < VSMALL)
         {
@@ -342,7 +342,7 @@ bool Foam::primitiveMesh::checkCellVolumes
 
     label nNegVolCells = 0;
 
-    forAll (vols, cellI)
+    forAll(vols, cellI)
     {
         if (vols[cellI] < VSMALL)
         {
@@ -421,7 +421,7 @@ bool Foam::primitiveMesh::checkFaceOrthogonality
 
     label errorNonOrth = 0;
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         const vector& s = areas[faceI];
@@ -534,7 +534,7 @@ bool Foam::primitiveMesh::checkFacePyramids
 
     label nErrorPyrs = 0;
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         // Create the owner pyramid - it will have negative volume
         scalar pyrVol = pyramidPointFaceRef(f[faceI], ctrs[own[faceI]]).mag(p);
@@ -619,7 +619,7 @@ bool Foam::primitiveMesh::checkFaceTets
 
     label nErrorPyrs = 0;
 
-    forAll (fcs, faceI)
+    forAll(fcs, faceI)
     {
         // Create the owner tets - they will have negative volume
         const face& f = fcs[faceI];
@@ -863,7 +863,7 @@ bool Foam::primitiveMesh::checkPoints
 
     const labelListList& pf = pointFaces();
 
-    forAll (pf, pointI)
+    forAll(pf, pointI)
     {
         if (pf[pointI].empty())
         {
@@ -877,7 +877,7 @@ bool Foam::primitiveMesh::checkPoints
     }
 
 
-    forAll (pf, pointI)
+    forAll(pf, pointI)
     {
         const labelList& pc = pointCells(pointI);
 
@@ -1360,7 +1360,7 @@ bool Foam::primitiveMesh::checkUpperTriangular
     // and add it to the check list (upper triangular order).
     // Once the list is completed, check it against the faceCell list
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -1498,7 +1498,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
     const faceList& f = faces();
     const cellList& c = cells();
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -1506,15 +1506,15 @@ bool Foam::primitiveMesh::checkCellsZipUp
 
         labelList edgeUsage(cellEdges.size(), 0);
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             edgeList curFaceEdges = f[curFaces[faceI]].edges();
 
-            forAll (curFaceEdges, faceEdgeI)
+            forAll(curFaceEdges, faceEdgeI)
             {
                 const edge& curEdge = curFaceEdges[faceEdgeI];
 
-                forAll (cellEdges, cellEdgeI)
+                forAll(cellEdges, cellEdgeI)
                 {
                     if (cellEdges[cellEdgeI] == curEdge)
                     {
@@ -1528,7 +1528,7 @@ bool Foam::primitiveMesh::checkCellsZipUp
         edgeList singleEdges(cellEdges.size());
         label nSingleEdges = 0;
 
-        forAll (edgeUsage, edgeI)
+        forAll(edgeUsage, edgeI)
         {
             if (edgeUsage[edgeI] == 1)
             {
@@ -1599,7 +1599,7 @@ bool Foam::primitiveMesh::checkFaceVertices
 
     label nErrorFaces = 0;
 
-    forAll (f, fI)
+    forAll(f, fI)
     {
         const face& curFace = f[fI];
 
@@ -1995,7 +1995,7 @@ bool Foam::primitiveMesh::checkCellDeterminant
     scalar sumDet = 0;
     label nSummed = 0;
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const labelList& curFaces = c[cellI];
 
@@ -2114,7 +2114,7 @@ bool Foam::primitiveMesh::checkConcaveCells
 
     label nConcaveCells = 0;
 
-    forAll (c, cellI)
+    forAll(c, cellI)
     {
         const cell& cFaces = c[cellI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
index 57bdf1a16b..3e6b006652 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
@@ -68,7 +68,7 @@ bool Foam::primitiveMesh::checkMeshMotion
     scalar minVolume = GREAT;
     label nNegVols = 0;
 
-    forAll (cellVols, cellI)
+    forAll(cellVols, cellI)
     {
         if (cellVols[cellI] < VSMALL)
         {
@@ -108,7 +108,7 @@ bool Foam::primitiveMesh::checkMeshMotion
     label nPyrErrors = 0;
     label nDotProductErrors = 0;
 
-    forAll (f, faceI)
+    forAll(f, faceI)
     {
         const scalar a = Foam::mag(fAreas[faceI]);
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 9b4bb9998f..5e25d94e36 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -79,7 +79,7 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas
 {
     const faceList& fs = faces();
 
-    forAll (fs, facei)
+    forAll(fs, facei)
     {
         const labelList& f = fs[facei];
         label nPoints = f.size();
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
index 4d30b3bbd5..8829a7e88e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
@@ -42,7 +42,7 @@ bool Foam::primitiveMesh::pointInCellBB(const point& p, label celli) const
     vector bbmax = -GREAT*vector::one;
     vector bbmin = GREAT*vector::one;
 
-    forAll (cellVertices, vertexI)
+    forAll(cellVertices, vertexI)
     {
         bbmax = max(bbmax, points[cellVertices[vertexI]]);
         bbmin = min(bbmin, points[cellVertices[vertexI]]);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
index ebd136b6f7..905f1ff4b9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointCells.C
@@ -63,11 +63,11 @@ void Foam::primitiveMesh::calcPointCells() const
 
         labelList npc(nPoints(), 0);
 
-        forAll (cf, cellI)
+        forAll(cf, cellI)
         {
             const labelList curPoints = cf[cellI].labels(faces());
 
-            forAll (curPoints, pointI)
+            forAll(curPoints, pointI)
             {
                 label ptI = curPoints[pointI];
 
@@ -81,18 +81,18 @@ void Foam::primitiveMesh::calcPointCells() const
         pcPtr_ = new labelListList(npc.size());
         labelListList& pointCellAddr = *pcPtr_;
 
-        forAll (pointCellAddr, pointI)
+        forAll(pointCellAddr, pointI)
         {
             pointCellAddr[pointI].setSize(npc[pointI]);
         }
         npc = 0;
 
 
-        forAll (cf, cellI)
+        forAll(cf, cellI)
         {
             const labelList curPoints = cf[cellI].labels(faces());
 
-            forAll (curPoints, pointI)
+            forAll(curPoints, pointI)
             {
                 label ptI = curPoints[pointI];
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
index ee37aeab09..c7b6280f92 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointPoints.C
@@ -60,11 +60,11 @@ void Foam::primitiveMesh::calcPointPoints() const
         ppPtr_ = new labelListList(pe.size());
         labelListList& pp = *ppPtr_;
 
-        forAll (pe, pointI)
+        forAll(pe, pointI)
         {
             pp[pointI].setSize(pe[pointI].size());
 
-            forAll (pe[pointI], ppi)
+            forAll(pe[pointI], ppi)
             {
                 if (e[pe[pointI][ppi]].start() == pointI)
                 {
diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H
index 9ac5927a49..3e4f4e53c7 100644
--- a/src/conversion/ensight/file/ensightFile.H
+++ b/src/conversion/ensight/file/ensightFile.H
@@ -79,7 +79,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     ~ensightFile();
 
 
diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C
index 97877a24a2..fb77cc83de 100644
--- a/src/conversion/ensight/part/ensightPartFaces.C
+++ b/src/conversion/ensight/part/ensightPartFaces.C
@@ -79,7 +79,7 @@ Foam::ensightPartFaces::ensightPartFaces
     label nQuad = 0;
     label nPoly = 0;
 
-    forAll (pPatch, patchfaceI)
+    forAll(pPatch, patchfaceI)
     {
         const face& f = pMesh.faces()[patchfaceI + offset_];
 
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 0c850541a8..db018c7cea 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -127,7 +127,7 @@ void Foam::meshWriters::STARCD::getCellTable()
         // get the cellZone <-> cellTable correspondence
         Info<< "matching cellZones to cellTable" << endl;
 
-        forAll (mesh_.cellZones(), zoneI)
+        forAll(mesh_.cellZones(), zoneI)
         {
             const cellZone& cZone = mesh_.cellZones()[zoneI];
             if (cZone.size())
@@ -144,7 +144,7 @@ void Foam::meshWriters::STARCD::getCellTable()
                     tableId = cellTable_.append(dict);
                 }
 
-                forAll (cZone, i)
+                forAll(cZone, i)
                 {
                     cellTableId_[cZone[i]] = tableId;
                 }
@@ -159,7 +159,7 @@ void Foam::meshWriters::STARCD::getCellTable()
             dict.add("MaterialType", "fluid");
             label tableId = cellTable_.append(dict);
 
-            forAll (cellTableId_, i)
+            forAll(cellTableId_, i)
             {
                 if (cellTableId_[i] < 0)
                 {
diff --git a/src/conversion/polyDualMesh/polyDualMesh.H b/src/conversion/polyDualMesh/polyDualMesh.H
index 338d645050..8c3ae117e8 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.H
+++ b/src/conversion/polyDualMesh/polyDualMesh.H
@@ -194,9 +194,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~polyDualMesh();
+    //- Destructor
+    ~polyDualMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
index 73688cddc1..31d68d43ef 100644
--- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
+++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H
@@ -92,9 +92,8 @@ public:
         static autoPtr<dynamicFvMesh> New(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~dynamicFvMesh();
+    //- Destructor
+    virtual ~dynamicFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
index 9c7ce08ef2..90477072fe 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.H
@@ -89,9 +89,8 @@ public:
         dynamicInkJetFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~dynamicInkJetFvMesh();
+    //- Destructor
+    ~dynamicInkJetFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
index 05956fdad9..ae4de7f3d1 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
+++ b/src/dynamicFvMesh/dynamicMotionSolverFvMesh/dynamicMotionSolverFvMesh.H
@@ -78,9 +78,8 @@ public:
         dynamicMotionSolverFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~dynamicMotionSolverFvMesh();
+    //- Destructor
+    ~dynamicMotionSolverFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
index ffb8bdf8bc..f230aceec7 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -169,9 +169,8 @@ public:
         explicit dynamicRefineFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~dynamicRefineFvMesh();
+    //- Destructor
+    virtual ~dynamicRefineFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
index 983914172e..ada62f0aa5 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SDA/SDA.H
@@ -119,9 +119,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SDA();
+    //- Destructor
+    virtual ~SDA();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
index a3afdb6b0c..a7e138dce8 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/linearMotion/linearMotion.H
@@ -85,9 +85,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~linearMotion();
+    //- Destructor
+    virtual ~linearMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
index 76b0e3164d..9d009feffb 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/multiMotion/multiMotion.H
@@ -85,9 +85,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~multiMotion();
+    //- Destructor
+    virtual ~multiMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
index dbfb3ffc9c..13961ff91a 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
@@ -88,9 +88,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~oscillatingLinearMotion();
+    //- Destructor
+    virtual ~oscillatingLinearMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
index 52e6d36b76..00c3e60f1b 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
@@ -91,9 +91,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~oscillatingRotatingMotion();
+    //- Destructor
+    virtual ~oscillatingRotatingMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index ce86664c78..071e980498 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -89,9 +89,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~rotatingMotion();
+    //- Destructor
+    virtual ~rotatingMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
index a343180f67..0f0bcb7787 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
@@ -117,9 +117,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~solidBodyMotionFunction();
+    //- Destructor
+    virtual ~solidBodyMotionFunction();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
index 0dcbc6c1d0..3ae0896272 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~tabulated6DoFMotion();
+    //- Destructor
+    virtual ~tabulated6DoFMotion();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
index e73d3116a3..a82cec3ca0 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
@@ -87,9 +87,8 @@ public:
         solidBodyMotionFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~solidBodyMotionFvMesh();
+    //- Destructor
+    ~solidBodyMotionFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
index d00fa41341..a25879fe9d 100644
--- a/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
+++ b/src/dynamicFvMesh/staticFvMesh/staticFvMesh.H
@@ -71,9 +71,8 @@ public:
         staticFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~staticFvMesh();
+    //- Destructor
+    ~staticFvMesh();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 1d0f84b70e..8375afe947 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -112,7 +112,7 @@ void Foam::attachDetach::checkDefinition()
 
             DynamicList<label> bouFacesInZone(addr.size());
 
-            forAll (addr, faceI)
+            forAll(addr, faceI)
             {
                 if (!mesh.isInternalFace(addr[faceI]))
                 {
@@ -180,7 +180,7 @@ void Foam::attachDetach::checkDefinition()
 
             DynamicList<label> zoneProblemFaces(addr.size());
 
-            forAll (addr, faceI)
+            forAll(addr, faceI)
             {
                 label facePatch =
                     mesh.boundaryMesh().whichPatch(addr[faceI]);
diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H
index 2f36d05183..36c3d25252 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/attachDetach/attachDetach.H
@@ -171,9 +171,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~attachDetach();
+    //- Destructor
+    virtual ~attachDetach();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index 04f9e233f0..8cf5c6f3e6 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -76,7 +76,7 @@ void Foam::attachDetach::calcPointMatchMap() const
 
     const label slavePatchStart = slavePatch.start();
 
-    forAll (reverseSlavePatch, faceI)
+    forAll(reverseSlavePatch, faceI)
     {
         reverseSlavePatch[faceI] =
             faces[slavePatchStart + faceI].reverseFace();
@@ -92,12 +92,12 @@ void Foam::attachDetach::calcPointMatchMap() const
     pointMatchMapPtr_ = new Map<label>(2*slaveMeshPoints.size());
     Map<label>& removedPointMap = *pointMatchMapPtr_;
 
-    forAll (masterLocalFaces, faceI)
+    forAll(masterLocalFaces, faceI)
     {
         const face& curMasterPoints = masterLocalFaces[faceI];
         const face& curSlavePoints = slaveLocalFaces[faceI];
 
-        forAll (curMasterPoints, pointI)
+        forAll(curMasterPoints, pointI)
         {
             // If the master and slave point labels are the same, the
             // point remains.  Otherwise, the slave point is removed and
diff --git a/src/dynamicMesh/attachDetach/attachInterface.C b/src/dynamicMesh/attachDetach/attachInterface.C
index c071637fb7..e195395e6a 100644
--- a/src/dynamicMesh/attachDetach/attachInterface.C
+++ b/src/dynamicMesh/attachDetach/attachInterface.C
@@ -81,7 +81,7 @@ void Foam::attachDetach::attachInterface
 
     const labelList removedPoints = removedPointMap.toc();
 
-    forAll (removedPoints, pointI)
+    forAll(removedPoints, pointI)
     {
         ref.setAction(polyRemovePoint(removedPoints[pointI]));
     }
@@ -100,7 +100,7 @@ void Foam::attachDetach::attachInterface
 
     const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
 
-    forAll (masterFaceCells, faceI)
+    forAll(masterFaceCells, faceI)
     {
         // If slave neighbour is greater than master, face does not need
         // turning.  Modify it to become internal
@@ -155,11 +155,11 @@ void Foam::attachDetach::attachInterface
 
     // Grab all the faces off the points in the slave patch.  If the face has
     //  not been removed, add it to the map of faces to renumber
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         const labelList& curFaces = pf[slaveMeshPoints[pointI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!ref.faceRemoved(curFaces[faceI]))
             {
@@ -171,7 +171,7 @@ void Foam::attachDetach::attachInterface
     // Grab the faces to be renumbered
     const labelList ftm = facesToModifyMap.toc();
 
-    forAll (ftm, faceI)
+    forAll(ftm, faceI)
     {
         // For every face to modify, copy the face and re-map the vertices.
         // It is known all the faces will be changed since they hang off
@@ -180,7 +180,7 @@ void Foam::attachDetach::attachInterface
 
         face newFace(faces[curFaceID]);
 
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::const_iterator rpmIter =
                 removedPointMap.find(newFace[pointI]);
@@ -267,7 +267,7 @@ void Foam::attachDetach::modifyMotionPoints
         // Calculate the difference in motion point positions
         scalar pointDiff = 0;
 
-        forAll (removedPoints, pointI)
+        forAll(removedPoints, pointI)
         {
             pointDiff +=
                 mag
@@ -284,7 +284,7 @@ void Foam::attachDetach::modifyMotionPoints
     }
 
     // Put the slave point on top of the master point
-    forAll (removedPoints, pointI)
+    forAll(removedPoints, pointI)
     {
         motionPoints[removedPoints[pointI]] =
             motionPoints[removedPointMap.find(removedPoints[pointI])()];
diff --git a/src/dynamicMesh/attachDetach/detachInterface.C b/src/dynamicMesh/attachDetach/detachInterface.C
index f1f6f41aff..4e80d42e00 100644
--- a/src/dynamicMesh/attachDetach/detachInterface.C
+++ b/src/dynamicMesh/attachDetach/detachInterface.C
@@ -127,7 +127,7 @@ void Foam::attachDetach::detachInterface
 
         bool edgeIsInternal = true;
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!mesh.isInternalFace(curFaces[faceI]))
             {
@@ -149,7 +149,7 @@ void Foam::attachDetach::detachInterface
 // Pout << "addedPoints before point creation: " << addedPoints << endl;
 
     // Create new points for face zone
-    forAll (addedPoints, pointI)
+    forAll(addedPoints, pointI)
     {
         if (addedPoints[pointI] < 0)
         {
@@ -181,7 +181,7 @@ void Foam::attachDetach::detachInterface
     const labelList& own = mesh.faceOwner();
     const labelList& nei = mesh.faceNeighbour();
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         const label curFaceID = mf[faceI];
 
@@ -190,7 +190,7 @@ void Foam::attachDetach::detachInterface
 
         face newFace(oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             newFace[pointI] = addedPoints[oldFace[pointI]];
         }
@@ -313,11 +313,11 @@ void Foam::attachDetach::detachInterface
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const labelList& curFaces = cells[mc[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the master patch; if not add it
             if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -333,7 +333,7 @@ void Foam::attachDetach::detachInterface
         // Make a map of master cells for quick reject
         labelHashSet mcMap(2*mc.size());
 
-        forAll (mc, mcI)
+        forAll(mc, mcI)
         {
             mcMap.insert(mc[mcI]);
         }
@@ -343,7 +343,7 @@ void Foam::attachDetach::detachInterface
         // faces to the map
         const labelList mcf = masterCellFaceMap.toc();
 
-        forAll (mcf, mcfI)
+        forAll(mcf, mcfI)
         {
             // Do the owner side
             const label ownCell = own[mcf[mcfI]];
@@ -353,7 +353,7 @@ void Foam::attachDetach::detachInterface
                 // Cell not found. Add its faces to the map
                 const cell& curFaces = cells[ownCell];
 
-                forAll (curFaces, faceI)
+                forAll(curFaces, faceI)
                 {
                     masterCellFaceMap.insert(curFaces[faceI]);
                 }
@@ -369,7 +369,7 @@ void Foam::attachDetach::detachInterface
                     // Cell not found. Add its faces to the map
                     const cell& curFaces = cells[neiCell];
 
-                    forAll (curFaces, faceI)
+                    forAll(curFaces, faceI)
                     {
                         masterCellFaceMap.insert(curFaces[faceI]);
                     }
@@ -381,7 +381,7 @@ void Foam::attachDetach::detachInterface
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         masterLayerPointMap.insert
         (
@@ -393,7 +393,7 @@ void Foam::attachDetach::detachInterface
     // Grab the list of faces of the master layer
     const labelList masterCellFaces = masterCellFaceMap.toc();
 
-    forAll (masterCellFaces, faceI)
+    forAll(masterCellFaces, faceI)
     {
         // Attempt to renumber the face using the masterLayerPointMap.
         // Missing point remain the same
@@ -406,7 +406,7 @@ void Foam::attachDetach::detachInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterLayerPointMap.found(oldFace[pointI]))
             {
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index 6d234ea925..4b1ef66634 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -190,9 +190,8 @@ public:
         boundaryMesh();
 
 
-    // Destructor
-
-        ~boundaryMesh();
+    //- Destructor
+    ~boundaryMesh();
 
         void clearOut();
 
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.H b/src/dynamicMesh/boundaryPatch/boundaryPatch.H
index e316ab86e6..1b83871607 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.H
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.H
@@ -89,9 +89,8 @@ public:
         autoPtr<boundaryPatch> clone() const;
 
 
-    // Destructor
-
-        ~boundaryPatch();
+    //- Destructor
+    ~boundaryPatch();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index 8042ccda7d..04af5db48b 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -90,10 +90,9 @@ private:
             {}
 
 
-        // Destructor
-
-            virtual ~directFvPatchFieldMapper()
-            {}
+        //- Destructor
+        virtual ~directFvPatchFieldMapper()
+        {}
 
 
         // Member Functions
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index ab429fb926..588dda7566 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -35,12 +35,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -68,12 +63,7 @@ void Foam::fvMeshDistribute::addPatchFields(const word& patchFieldType)
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -108,12 +98,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatchFields()
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -147,12 +132,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
 
     label i = 0;
 
-    for
-    (
-        typename HashTable<const fldType*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const fldType*>, flds, iter)
     {
         const fldType& fld = *iter();
 
@@ -189,12 +169,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields
 
     label fieldI = 0;
 
-    for
-    (
-        typename HashTable<const fldType*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const fldType*>, flds, iter)
     {
         const fldType& fld = *iter();
         typename fldType::GeometricBoundaryField& bfld =
@@ -245,12 +220,7 @@ void Foam::fvMeshDistribute::initPatchFields
         mesh_.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
index 868d8b694d..70f3e29cb0 100644
--- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C
@@ -60,7 +60,7 @@ Foam::tmp<Foam::vectorField> Foam::layerAdditionRemoval::extrusionDir() const
         // Detected a valid layer.  Grab the point and face collapse mapping
         const labelList& ptc = pointsPairing();
 
-        forAll (extrusionDir, mpI)
+        forAll(extrusionDir, mpI)
         {
             extrusionDir[mpI] = points[ptc[mpI]] - points[mp[mpI]];
         }
@@ -125,7 +125,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Add the new points
     labelList addedPoints(mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         // Add the point nominal thickness away from the master zone point
         // and grab the label
@@ -159,7 +159,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     labelList addedCells(mf.size());
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         addedCells[faceI] =
             ref.setAction
@@ -187,13 +187,13 @@ void Foam::layerAdditionRemoval::addCellLayer
     // owner: if the master cell is equal to the face owner the flux
     // remains the same; otherwise it is flipped
 
-    forAll (zoneFaces, faceI)
+    forAll(zoneFaces, faceI)
     {
         const face oldFace = zoneFaces[faceI].reverseFace();
 
         face newFace(oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             newFace[pointI] = addedPoints[oldFace[pointI]];
         }
@@ -235,7 +235,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     const faceList& faces = mesh.faces();
 // Pout << "mfFlip: " << mfFlip << endl;
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         const label curfaceID = mf[faceI];
 
@@ -381,7 +381,7 @@ void Foam::layerAdditionRemoval::addCellLayer
         label patchID = -1;
         label zoneID = -1;
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             const label cf = curFaces[faceI];
 
@@ -447,11 +447,11 @@ void Foam::layerAdditionRemoval::addCellLayer
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const labelList& curFaces = cells[mc[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the master zone; if not add it
             if (zoneMesh.whichZone(curFaces[faceI]) != faceZoneID_.index())
@@ -464,7 +464,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Create the master layer point map
     Map<label> masterLayerPointMap(2*mp.size());
 
-    forAll (mp, pointI)
+    forAll(mp, pointI)
     {
         masterLayerPointMap.insert
         (
@@ -476,7 +476,7 @@ void Foam::layerAdditionRemoval::addCellLayer
     // Grab the list of faces of the master layer
     const labelList masterCellFaces = masterCellFaceMap.toc();
 
-    forAll (masterCellFaces, faceI)
+    forAll(masterCellFaces, faceI)
     {
         // Attempt to renumber the face using the masterLayerPointMap.
         // Missing point remain the same
@@ -489,7 +489,7 @@ void Foam::layerAdditionRemoval::addCellLayer
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterLayerPointMap.found(oldFace[pointI]))
             {
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 6f2041ddfb..ea79578a50 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -207,7 +207,7 @@ bool Foam::layerAdditionRemoval::changeTopology() const
     scalar minDelta = GREAT;
     scalar maxDelta = 0;
 
-    forAll (fz, faceI)
+    forAll(fz, faceI)
     {
         scalar curDelta = V[mc[faceI]]/mag(S[fz[faceI]]);
         avgDelta += curDelta;
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
index 2b59c3fbfd..ce71525729 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
@@ -165,9 +165,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~layerAdditionRemoval();
+    //- Destructor
+    virtual ~layerAdditionRemoval();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
index 90180af091..d8645b18a8 100644
--- a/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
+++ b/src/dynamicMesh/layerAdditionRemoval/removeCellLayer.C
@@ -57,7 +57,7 @@ bool Foam::layerAdditionRemoval::validCollapse() const
 
     label nBoundaryHits = 0;
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         if
         (
@@ -114,7 +114,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& mc =
         topoChanger().mesh().faceZones()[faceZoneID_.index()].masterCells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         ref.setAction(polyRemoveCell(mc[cellI]));
     }
@@ -125,11 +125,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
     const cellList& cells = mesh.cells();
 
-    forAll (mc, cellI)
+    forAll(mc, cellI)
     {
         const cell& curCell = cells[mc[cellI]];
 
-        forAll (curCell, faceI)
+        forAll(curCell, faceI)
         {
             // Check if the face is in the master zone.  If not, remove it
             if
@@ -149,7 +149,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     }
 
     // Remove all points that will be collapsed
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         ref.setAction(polyRemovePoint(ptc[pointI]));
     }
@@ -166,7 +166,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& meshPoints =
         mesh.faceZones()[faceZoneID_.index()]().meshPoints();
 
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         removedPointMap.insert(ptc[pointI], meshPoints[pointI]);
     }
@@ -180,11 +180,11 @@ void Foam::layerAdditionRemoval::removeCellLayer
     // Make a list of faces to be modified using the map to avoid duplicates
     labelHashSet facesToModify(ptc.size()*primitiveMesh::facesPerPoint_);
 
-    forAll (ptc, pointI)
+    forAll(ptc, pointI)
     {
         const labelList& curFaces = pf[ptc[pointI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!facesToRemoveMap.found(curFaces[faceI]))
             {
@@ -197,7 +197,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
 //Pout << "faces to modify: " << ftm << endl;
 
-    forAll (ftm, faceI)
+    forAll(ftm, faceI)
     {
         // For every face to modify, copy the face and re-map the vertices.
         // It is known all the faces will be changed since they hang off
@@ -206,7 +206,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
 
         face newFace(faces[curFaceID]);
 
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::iterator rpmIter =
                 removedPointMap.find(newFace[pointI]);
@@ -269,7 +269,7 @@ void Foam::layerAdditionRemoval::removeCellLayer
     const labelList& mf = mesh.faceZones()[faceZoneID_.index()];
     const boolList& mfFlip = mesh.faceZones()[faceZoneID_.index()].flipMap();
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         // Grab the owner and neighbour of the faces to be collapsed and get rid
         // of the cell to be removed
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index e42896cf61..766196f00e 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -95,7 +95,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
     label nPointErrors = 0;
     label nFaceErrors = 0;
 
-    forAll (mf, faceI)
+    forAll(mf, faceI)
     {
         // Get the local master face
         face curLocalFace = mlf[faceI];
@@ -128,7 +128,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
         ftc[faceI] = lidFace.oppositeIndex();
 
         // Using the local face insert the points into the lid list
-        forAll (curLocalFace, pointI)
+        forAll(curLocalFace, pointI)
         {
             const label clp = curLocalFace[pointI];
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index 906d238886..be45a3c70d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -520,9 +520,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~cellCuts();
+    //- Destructor
+    ~cellCuts();
 
         //- Clear out demand driven storage
         void clearOut();
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index e746859357..37defc1d63 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -160,9 +160,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cellLooper();
+    //- Destructor
+    virtual ~cellLooper();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
index 9914bd1c6b..eb6b24e429 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
@@ -146,9 +146,8 @@ public:
         geomCellLooper(const polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~geomCellLooper();
+    //- Destructor
+    virtual ~geomCellLooper();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
index 7b7faf8682..8e869e9287 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
@@ -116,9 +116,8 @@ public:
         hexCellLooper(const polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~hexCellLooper();
+    //- Destructor
+    virtual ~hexCellLooper();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
index 120bc4918a..e747be6470 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
@@ -168,9 +168,8 @@ public:
         topoCellLooper(const polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~topoCellLooper();
+    //- Destructor
+    virtual ~topoCellLooper();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
index 5993d96e3d..e56d7a9c90 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
@@ -68,12 +68,7 @@ void Foam::edgeVertex::updateLabels
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        Map<label>::const_iterator iter = cellPairs.begin();
-        iter != cellPairs.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, cellPairs, iter)
     {
         label newMaster = map[iter.key()];
 
@@ -97,12 +92,7 @@ void Foam::edgeVertex::updateLabels
     {
         Map<label> newCellPairs(2*cellPairs.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = cellPairs.begin();
-            iter != cellPairs.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, cellPairs, iter)
         {
             label newMaster = map[iter.key()];
 
@@ -144,14 +134,9 @@ void Foam::edgeVertex::updateLabels
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        labelHashSet::const_iterator iter = cells.begin();
-        iter != cells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, cells, iter)
     {
-        label newCellI = map[iter.key()];
+        const label newCellI = map[iter.key()];
 
         if (newCellI != iter.key())
         {
@@ -166,14 +151,9 @@ void Foam::edgeVertex::updateLabels
     {
         labelHashSet newCells(2*cells.size());
 
-        for
-        (
-            labelHashSet::const_iterator iter = cells.begin();
-            iter != cells.end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, cells, iter)
         {
-            label newCellI = map[iter.key()];
+            const label newCellI = map[iter.key()];
 
             if (newCellI != -1)
             {
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index b8fe66430f..ca49c74f9b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -128,9 +128,8 @@ public:
         boundaryCutter(const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~boundaryCutter();
+    //- Destructor
+    ~boundaryCutter();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index a33ac69f57..fc344448a7 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -887,12 +887,7 @@ void Foam::meshCutAndRemove::setRefinement
 
     const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
 
-    for
-    (
-        Map<edge>::const_iterator iter = faceSplitCuts.begin();
-        iter != faceSplitCuts.end();
-        ++iter
-    )
+    forAllConstIter(Map<edge>, faceSplitCuts, iter)
     {
         label faceI = iter.key();
 
@@ -1310,15 +1305,9 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
     {
         Map<label> newAddedFaces(addedFaces_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedFaces_.begin();
-            iter != addedFaces_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedFaces_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = map.reverseCellMap()[cellI];
 
             label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index f7e97a488f..00d0afd67b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -737,12 +737,7 @@ void Foam::meshCutter::setRefinement
 
     const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
 
-    for
-    (
-        Map<edge>::const_iterator iter = faceSplitCuts.begin();
-        iter != faceSplitCuts.end();
-        ++iter
-    )
+    forAllConstIter(Map<edge>, faceSplitCuts, iter)
     {
         label faceI = iter.key();
 
@@ -1015,15 +1010,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
         // key.
         Map<label> newAddedCells(addedCells_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedCells_.begin();
-            iter != addedCells_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedCells_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = morphMap.reverseCellMap()[cellI];
 
             label addedCellI = iter();
@@ -1054,15 +1043,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
     {
         Map<label> newAddedFaces(addedFaces_.size());
 
-        for
-        (
-            Map<label>::const_iterator iter = addedFaces_.begin();
-            iter != addedFaces_.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedFaces_, iter)
         {
             label cellI = iter.key();
-
             label newCellI = morphMap.reverseCellMap()[cellI];
 
             label addedFaceI = iter();
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index fd34d689ba..981430e33f 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -274,9 +274,8 @@ public:
         meshCutter(const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~meshCutter();
+    //- Destructor
+    ~meshCutter();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index 5e14328974..bcad8bef91 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -40,10 +40,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(multiDirRefinement, 0);
-}
+defineTypeNameAndDebug(Foam::multiDirRefinement, 0);
 
 
 // * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * //
@@ -93,12 +90,7 @@ void Foam::multiDirRefinement::update
 {
     field.setSize(field.size() + splitMap.size());
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         field[iter()] = field[iter.key()];
     }
@@ -116,12 +108,7 @@ void Foam::multiDirRefinement::addCells
 
     labels.setSize(labels.size() + splitMap.size());
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         labels[newCellI++] = iter();
     }
@@ -165,12 +152,7 @@ void Foam::multiDirRefinement::addCells
     }
 
 
-    for
-    (
-        Map<label>::const_iterator iter = splitMap.begin();
-        iter != splitMap.end();
-        ++iter
-    )
+    forAllConstIter(Map<label>, splitMap, iter)
     {
         label masterI = iter.key();
         label newCellI = iter();
@@ -307,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
         // Increment count
         forAll(consistentCells, i)
         {
-            label cellI = consistentCells[i];
+            const label cellI = consistentCells[i];
 
             Map<label>::iterator iter = hexCellSet.find(cellI);
 
@@ -380,7 +362,7 @@ void Foam::multiDirRefinement::refineHex8
 
     forAll(cellMap, cellI)
     {
-        label oldCellI = cellMap[cellI];
+        const label oldCellI = cellMap[cellI];
 
         if (addedCells_[oldCellI].size())
         {
@@ -439,7 +421,7 @@ void Foam::multiDirRefinement::refineAllDirs
             // Non uniform directions.
             forAll(refCells, refI)
             {
-                label cellI = cellLabels_[refI];
+                const label cellI = cellLabels_[refI];
 
                 refCells[refI] = refineCell(cellI, dirField[cellI]);
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index de9dd525d1..422a98d57a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -36,12 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(refinementIterator, 0);
-
-}
+defineTypeNameAndDebug(Foam::refinementIterator, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -212,12 +207,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
         // from meshRefiner.updateMesh call) and add to global list of added
         const Map<label>& addedNow = meshRefiner_.addedCells();
 
-        for
-        (
-            Map<label>::const_iterator iter = addedNow.begin();
-            iter != addedNow.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, addedNow, iter)
         {
             if (!addedCells.insert(iter.key(), iter()))
             {
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
index a3335d0f22..a0e8fa03f0 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~refinementIterator();
+    //- Destructor
+    ~refinementIterator();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 9f27564cf4..ef2ece26b1 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -36,10 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-defineTypeNameAndDebug(undoableMeshCutter, 0);
-}
+defineTypeNameAndDebug(Foam::undoableMeshCutter, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -67,12 +65,7 @@ void Foam::undoableMeshCutter::printCellRefTree
 // For debugging
 void Foam::undoableMeshCutter::printRefTree(Ostream& os) const
 {
-    for
-    (
-        Map<splitCell*>::const_iterator iter = liveSplitCells_.begin();
-        iter != liveSplitCells_.end();
-        ++iter
-    )
+    forAllConstIter(Map<splitCell*>, liveSplitCells_, iter)
     {
         const splitCell* splitPtr = iter();
 
@@ -113,7 +106,7 @@ void Foam::undoableMeshCutter::updateLabels
 
     bool changed = false;
 
-    forAllConstIter(Map<splitCell*>,liveSplitCells, iter)
+    forAllConstIter(Map<splitCell*>, liveSplitCells, iter)
     {
         const splitCell* splitPtr = iter();
 
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
index df188963b6..648d6461a6 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
@@ -149,9 +149,8 @@ public:
         undoableMeshCutter(const polyMesh& mesh, const bool undoable = true);
 
 
-    // Destructor
-
-        ~undoableMeshCutter();
+    //- Destructor
+    ~undoableMeshCutter();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.H b/src/dynamicMesh/meshCut/splitCell/splitCell.H
index 7143ba2fcf..6595908a7f 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.H
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.H
@@ -83,9 +83,8 @@ public:
         splitCell(const label cellI, splitCell* parent);
 
 
-    // Destructor
-
-        ~splitCell();
+    //- Destructor
+    ~splitCell();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index 57522fd0e3..f5df37e677 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -305,9 +305,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~motionSmoother();
+    //- Destructor
+    ~motionSmoother();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolver/motionSolver.H
index 5e125e05a5..44889d937f 100644
--- a/src/dynamicMesh/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolver/motionSolver.H
@@ -97,9 +97,8 @@ public:
         motionSolver(const polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~motionSolver();
+    //- Destructor
+    virtual ~motionSolver();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 301091ca8a..27370c56ce 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -299,15 +299,9 @@ void Foam::perfectInterface::setRefinement
 
 
     // 2. Renumber (non patch0/1) faces.
-    for
-    (
-        labelHashSet::const_iterator iter = affectedFaces.begin();
-        iter != affectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, affectedFaces, iter)
     {
-        label faceI = iter.key();
-
+        const label faceI = iter.key();
         const face& f = mesh.faces()[faceI];
 
         face newFace(f.size());
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H
index a1423b5b77..f133842b3f 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.H
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.H
@@ -114,9 +114,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~perfectInterface();
+    //- Destructor
+    virtual ~perfectInterface();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index 613b915b2a..d2fbdf3ec5 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -419,9 +419,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~faceCoupleInfo();
+    //- Destructor
+    ~faceCoupleInfo();
 
 
 
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 65bca6a2f0..4eae7a7c69 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -930,7 +930,7 @@ void Foam::polyMeshAdder::mergePointZones
 
     from1ToAll.setSize(pz1.size());
 
-    forAll (pz1, zoneI)
+    forAll(pz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(pz1[zoneI].name(), zoneNames);
     }
@@ -996,7 +996,7 @@ void Foam::polyMeshAdder::mergeFaceZones
 
     from1ToAll.setSize(fz1.size());
 
-    forAll (fz1, zoneI)
+    forAll(fz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(fz1[zoneI].name(), zoneNames);
     }
@@ -1096,7 +1096,7 @@ void Foam::polyMeshAdder::mergeCellZones
     append(cz0.names(), zoneNames);
 
     from1ToAll.setSize(cz1.size());
-    forAll (cz1, zoneI)
+    forAll(cz1, zoneI)
     {
         from1ToAll[zoneI] = zoneIndex(cz1[zoneI].name(), zoneNames);
     }
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index 460059c288..f9da5b125f 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -82,7 +82,7 @@ void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
         List<polyPatch*> newPatches(oldPatches.size());
         label nNewPatches = 0;
 
-        forAll (oldPatches, patchI)
+        forAll(oldPatches, patchI)
         {
             if (oldPatches[patchI].size())
             {
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
index c9d61357a9..b39ebd3bd4 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.H
@@ -83,10 +83,9 @@ public:
         explicit attachPolyTopoChanger(polyMesh&);
 
 
-    // Destructor
-
-        virtual ~attachPolyTopoChanger()
-        {}
+    //- Destructor
+    virtual ~attachPolyTopoChanger()
+    {}
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
index 81300bba04..ad083ee42a 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
@@ -134,9 +134,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~polyMeshModifier();
+    //- Destructor
+    virtual ~polyMeshModifier();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 37e4b18b66..5dc59ad815 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -36,12 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
+defineTypeNameAndDebug(Foam::combineFaces, 0);
 
-defineTypeNameAndDebug(combineFaces, 0);
-
-}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 22b12be984..c180f59b76 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -462,12 +462,7 @@ void Foam::faceCollapser::setRefinement
         }
     }
 
-    for
-    (
-        Map<labelList>::const_iterator iter = splitEdges.begin();
-        iter != splitEdges.end();
-        ++iter
-    )
+    forAllConstIter(Map<labelList>, splitEdges, iter)
     {
         Pout<< "Split edge:" << iter.key()
             << " verts:" << mesh_.edges()[iter.key()]
@@ -500,12 +495,7 @@ void Foam::faceCollapser::setRefinement
     // Modify faces affected (but not removed)
     //
 
-    for
-    (
-        labelHashSet::const_iterator iter = affectedFaces.begin();
-        iter != affectedFaces.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, affectedFaces, iter)
     {
         filterFace(splitEdges, iter.key(), meshMod);
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index f2db1f59f5..1c1b32cced 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -534,7 +534,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
 
 
     // loop over the cells
-    forAll (visited, cellI)
+    forAll(visited, cellI)
     {
         // find the first non-removed cell that has not been visited yet
         if (!cellRemoved(cellI) && visited[cellI] == 0)
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
index ca068eaf5e..09af23ae96 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/topoAction/topoAction.H
@@ -66,10 +66,9 @@ public:
         virtual autoPtr<topoAction> clone() const = 0;
 
 
-    // Destructor
-
-        virtual ~topoAction()
-        {}
+    //- Destructor
+    virtual ~topoAction()
+    {}
 
 };
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
index 18885d22c9..1f7de13aba 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C
@@ -130,7 +130,7 @@ Foam::wordList Foam::polyTopoChanger::types() const
 
     wordList t(modifiers.size());
 
-    forAll (modifiers, modifierI)
+    forAll(modifiers, modifierI)
     {
         t[modifierI] = modifiers[modifierI].type();
     }
@@ -146,7 +146,7 @@ Foam::wordList Foam::polyTopoChanger::names() const
 
     wordList t(modifiers.size());
 
-    forAll (modifiers, modifierI)
+    forAll(modifiers, modifierI)
     {
         t[modifierI] = modifiers[modifierI].name();
     }
@@ -163,7 +163,7 @@ bool Foam::polyTopoChanger::changeTopology() const
 
     bool triggerChange = false;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -211,7 +211,7 @@ Foam::polyTopoChanger::topoChangeRequest() const
     polyTopoChange* refPtr(new polyTopoChange(mesh()));
     polyTopoChange& ref = *refPtr;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -228,7 +228,7 @@ void Foam::polyTopoChanger::modifyMotionPoints(pointField& p) const
 {
     const PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].active())
         {
@@ -244,7 +244,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m)
     // Go through all mesh modifiers and accumulate the morphing information
     PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         topoChanges[morphI].updateMesh(m);
     }
@@ -298,7 +298,7 @@ void Foam::polyTopoChanger::addTopologyModifiers
     setSize(tm.size());
 
     // Copy the patch pointers
-    forAll (tm, tmI)
+    forAll(tm, tmI)
     {
         if (tm[tmI]->topoChanger() != *this)
         {
@@ -323,7 +323,7 @@ Foam::label Foam::polyTopoChanger::findModifierID
 {
     const PtrList<polyMeshModifier>& topoChanges = *this;
 
-    forAll (topoChanges, morphI)
+    forAll(topoChanges, morphI)
     {
         if (topoChanges[morphI].name() == modName)
         {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
index 71670a4850..8f9ad50a00 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
@@ -92,10 +92,9 @@ public:
         explicit polyTopoChanger(polyMesh&);
 
 
-    // Destructor
-
-        virtual ~polyTopoChanger()
-        {}
+    //- Destructor
+    virtual ~polyTopoChanger()
+    {}
 
 
     // Member functions
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
index 1158ee6906..0353c4b0c2 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
@@ -80,10 +80,9 @@ public:
         explicit repatchPolyTopoChanger(polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~repatchPolyTopoChanger()
-        {}
+    //- Destructor
+    virtual ~repatchPolyTopoChanger()
+    {}
 
 
     // Member Functions
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index 7ff6c9edb9..648155b915 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -83,9 +83,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~setUpdater();
+    //- Destructor
+    virtual ~setUpdater();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
index c2e7b5ce72..9ab84988e3 100644
--- a/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
+++ b/src/dynamicMesh/setUpdater/setUpdaterTemplates.C
@@ -46,12 +46,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
     HashTable<const Type*> memSets =
         morphMap.mesh().objectRegistry::lookupClass<Type>();
 
-    for
-    (
-        typename HashTable<const Type*>::iterator iter = memSets.begin();
-        iter != memSets.end();
-        ++iter
-    )
+    forAllIter(typename HashTable<const Type*>, memSets, iter)
     {
         Type& set = const_cast<Type&>(*iter());
 
@@ -82,12 +77,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
 
     IOobjectList fileSets(Objects.lookupClass(Type::typeName));
 
-    for
-    (
-        IOobjectList::const_iterator iter = fileSets.begin();
-        iter != fileSets.end();
-        ++iter
-    )
+    forAllConstIter(IOobjectList, fileSets, iter)
     {
         if (!memSets.found(iter.key()))
         {
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 7c4ab7553d..410bb1d710 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -157,7 +157,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     Map<label>& pointMergeMap = cutPatch.pointMergeMap();
 
     // Create mapping for every merged point of the slave patch
-    forAll (slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointI)
     {
         if (slavePointPointHits[pointI] >= 0)
         {
@@ -175,7 +175,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<labelHashSet> usedMasterEdges(slaveEdges.size());
 
     // Collect of slave point hits
-    forAll (slavePointPointHits, pointI)
+    forAll(slavePointPointHits, pointI)
     {
         // For point hits, add all point-edges from master side to all point
         const labelList& curSlaveEdges = slavePointEdges[pointI];
@@ -187,11 +187,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
             // Mark all current master edges as used for all the current slave
             // edges
-            forAll (curSlaveEdges, slaveEdgeI)
+            forAll(curSlaveEdges, slaveEdgeI)
             {
                 labelHashSet& sm = usedMasterEdges[curSlaveEdges[slaveEdgeI]];
 
-                forAll (curMasterEdges, masterEdgeI)
+                forAll(curMasterEdges, masterEdgeI)
                 {
                     sm.insert(curMasterEdges[masterEdgeI]);
                 }
@@ -200,7 +200,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         else if (slavePointEdgeHits[pointI] > -1)
         {
             // For edge hits, add the master edge
-            forAll (curSlaveEdges, slaveEdgeI)
+            forAll(curSlaveEdges, slaveEdgeI)
             {
                 usedMasterEdges[curSlaveEdges[slaveEdgeI]].insert
                 (
@@ -213,7 +213,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     // Collect off master point hits
     // For every master point that has hit an edge, add all edges coming from
     // that point to the slave edge that has been hit
-    forAll (masterPointEdgeHits, masterPointI)
+    forAll(masterPointEdgeHits, masterPointI)
     {
         if (masterPointEdgeHits[masterPointI] > -1)
         {
@@ -222,7 +222,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             labelHashSet& sm =
                 usedMasterEdges[masterPointEdgeHits[masterPointI]];
 
-            forAll (curMasterEdges, masterEdgeI)
+            forAll(curMasterEdges, masterEdgeI)
             {
                 sm.insert(curMasterEdges[masterEdgeI]);
             }
@@ -230,7 +230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
 //     Pout << "used edges: " << endl;
-//     forAll (usedMasterEdges, edgeI)
+//     forAll(usedMasterEdges, edgeI)
 //     {
 //         Pout << "edge: " << edgeI << " used: " << usedMasterEdges[edgeI].toc() << endl;
 //     }
@@ -241,7 +241,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     List<DynamicList<label> > pointsIntoSlaveEdges(slaveEdges.size());
 
     // Add all points from the slave patch that have hit the edge
-    forAll (slavePointEdgeHits, pointI)
+    forAll(slavePointEdgeHits, pointI)
     {
         if (slavePointEdgeHits[pointI] > -1)
         {
@@ -294,7 +294,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
     // Add all points from the slave patch that have hit a face
-    forAll (slavePointFaceHits, pointI)
+    forAll(slavePointFaceHits, pointI)
     {
         if
         (
@@ -333,7 +333,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         }
     }
 
-    forAll (masterPointEdgeHits, pointI)
+    forAll(masterPointEdgeHits, pointI)
     {
         if (masterPointEdgeHits[pointI] > -1)
         {
@@ -402,7 +402,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -443,11 +443,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                 const labelList cf = addedFaces.toc();
                 addedFaces.clear();
 
-                forAll (cf, cfI)
+                forAll(cf, cfI)
                 {
                     const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                    forAll (curNbrs, nbrI)
+                    forAll(curNbrs, nbrI)
                     {
                         if (!curFaceMap.found(curNbrs[nbrI]))
                         {
@@ -493,11 +493,11 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     const labelList cf = addedFaces.toc();
                     addedFaces.clear();
 
-                    forAll (cf, cfI)
+                    forAll(cf, cfI)
                     {
                         const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                        forAll (curNbrs, nbrI)
+                        forAll(curNbrs, nbrI)
                         {
                             if (!curFaceMap.found(curNbrs[nbrI]))
                             {
@@ -541,7 +541,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
             const labelList curFaces = curFaceMap.toc();
 //             Pout << "curFaces: " << curFaces << endl;
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
 //                 Pout<< "face: " << curFaces[faceI] << " "
 //                     << masterPatch[curFaces[faceI]]
@@ -550,7 +550,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //                     << endl;
                 const labelList& me = masterFaceEdges[curFaces[faceI]];
 
-                forAll (me, meI)
+                forAll(me, meI)
                 {
                     curMasterEdgesMap.insert(me[meI]);
                 }
@@ -588,7 +588,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             linePointRef curSlaveLine = curEdge.line(projectedSlavePoints);
             const scalar curSlaveLineMag = curSlaveLine.mag();
 //             Pout << "curSlaveLine: " << curSlaveLine << endl;
-            forAll (curMasterEdges, masterEdgeI)
+            forAll(curMasterEdges, masterEdgeI)
             {
                 if (!curUme.found(curMasterEdges[masterEdgeI]))
                 {
@@ -746,14 +746,14 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     // Re-pack the points into edges lists
     labelListList pime(pointsIntoMasterEdges.size());
 
-    forAll (pointsIntoMasterEdges, i)
+    forAll(pointsIntoMasterEdges, i)
     {
         pime[i].transfer(pointsIntoMasterEdges[i]);
     }
 
     labelListList pise(pointsIntoSlaveEdges.size());
 
-    forAll (pointsIntoSlaveEdges, i)
+    forAll(pointsIntoSlaveEdges, i)
     {
         pise[i].transfer(pointsIntoSlaveEdges[i]);
     }
@@ -788,7 +788,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     boolList orphanedMaster(masterPatch.size(), false);
     boolList orphanedSlave(slavePatch.size(), false);
 
-    forAll (cutFaces, faceI)
+    forAll(cutFaces, faceI)
     {
         const face& curCutFace = cutFaces[faceI];
         const label curMaster = cutFaceMaster[faceI];
@@ -889,7 +889,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
             // Renumber the slave face into merged labels
             face rsf(slavePatch[curSlave]);
 
-            forAll (rsf, i)
+            forAll(rsf, i)
             {
                 Map<label>::const_iterator mpIter = pointMergeMap.find(rsf[i]);
 
@@ -1107,7 +1107,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nOrphanedMasters = 0;
 
-    forAll (orphanedMaster, faceI)
+    forAll(orphanedMaster, faceI)
     {
         if (orphanedMaster[faceI])
         {
@@ -1138,7 +1138,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nOrphanedSlaves = 0;
 
-    forAll (orphanedSlave, faceI)
+    forAll(orphanedSlave, faceI)
     {
         if (orphanedSlave[faceI])
         {
@@ -1197,7 +1197,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //     Pout << "masterStickOuts: " << masterStickOuts << endl;
 
     // Re-create the master stick-out faces
-    forAll (masterStickOuts, faceI)
+    forAll(masterStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -1211,7 +1211,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll (oldRichFace, pointI)
+        forAll(oldRichFace, pointI)
         {
             if (ref.pointRemoved(oldRichFace[pointI]))
             {
@@ -1230,7 +1230,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 //         Pout << "old rich master face: " << oldRichFace << " old face: " << oldFace << endl;
         DynamicList<label> newFaceLabels(2*oldFace.size());
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             if (masterMeshPointMap.found(oldFace[pointI]))
             {
@@ -1273,7 +1273,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     // Find the points on the edge between them
                     const label localNextLabel = mmpmIter();
 
-                    forAll (curEdges, curEdgeI)
+                    forAll(curEdges, curEdgeI)
                     {
                         if
                         (
@@ -1306,7 +1306,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
                                 scalarField edgePointWeights(curPime.size());
 
-                                forAll (curPime, curPimeI)
+                                forAll(curPime, curPimeI)
                                 {
                                     edgePointWeights[curPimeI] =
                                         (
@@ -1354,7 +1354,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                     label nextPoint = -1;
                                     scalar dist = 2;
 
-                                    forAll (edgePointWeights, wI)
+                                    forAll(edgePointWeights, wI)
                                     {
                                         if (edgePointWeights[wI] < dist)
                                         {
@@ -1468,7 +1468,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     // Re-create the slave stick-out faces
 
-    forAll (slaveStickOuts, faceI)
+    forAll(slaveStickOuts, faceI)
     {
         // Renumber the face and remove additional points
         const label curFaceID = slaveStickOuts[faceI];
@@ -1481,7 +1481,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         face oldFace(oldRichFace.size());
         label nOldFace = 0;
 
-        forAll (oldRichFace, pointI)
+        forAll(oldRichFace, pointI)
         {
             if
             (
@@ -1517,7 +1517,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
         DynamicList<label> newFaceLabels(2*oldFace.size());
 
 //         Pout << "old rich slave face: " << oldRichFace << " old face: " << oldFace << endl;
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Try to find the point in retired points
             label curP = oldFace[pointI];
@@ -1580,7 +1580,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                     // Find the points on the edge between them
                     const label localNextLabel = mmpmIter();
 
-                    forAll (curEdges, curEdgeI)
+                    forAll(curEdges, curEdgeI)
                     {
                         if
                         (
@@ -1613,7 +1613,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
                                 scalarField edgePointWeights(curPise.size());
 
-                                forAll (curPise, curPiseI)
+                                forAll(curPise, curPiseI)
                                 {
                                     edgePointWeights[curPiseI] =
                                     (
@@ -1661,7 +1661,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                                     label nextPoint = -1;
                                     scalar dist = 2;
 
-                                    forAll (edgePointWeights, wI)
+                                    forAll(edgePointWeights, wI)
                                     {
                                         if (edgePointWeights[wI] < dist)
                                         {
@@ -1782,7 +1782,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
 
     label nRetiredPoints = 0;
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         if (pointMergeMap.found(slaveMeshPoints[pointI]))
         {
diff --git a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
index 1684a7c20d..5271b4cdb3 100644
--- a/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/decoupleSlidingInterface.C
@@ -82,7 +82,7 @@ void Foam::slidingInterface::decoupleInterface
 
     // Recover faces in master patch
 
-    forAll (masterPatchAddr, faceI)
+    forAll(masterPatchAddr, faceI)
     {
         // Make a copy of the face and turn it if necessary
         face newFace = faces[masterPatchAddr[faceI]];
@@ -128,7 +128,7 @@ void Foam::slidingInterface::decoupleInterface
 
     // Recover faces in slave patch
 
-    forAll (slavePatchAddr, faceI)
+    forAll(slavePatchAddr, faceI)
     {
         // Make a copy of face and turn it if necessary
         face newFace = faces[slavePatchAddr[faceI]];
@@ -139,7 +139,7 @@ void Foam::slidingInterface::decoupleInterface
         }
 
         // Recover retired points on the slave side
-        forAll (newFace, pointI)
+        forAll(newFace, pointI)
         {
             Map<label>::const_iterator rpmIter = rpm.find(newFace[pointI]);
             if (rpmIter != rpm.end())
@@ -172,7 +172,7 @@ void Foam::slidingInterface::decoupleInterface
     // Grab the list of faces in the layer
     const labelList& masterStickOuts = masterStickOutFaces();
 
-    forAll (masterStickOuts, faceI)
+    forAll(masterStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -184,7 +184,7 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Check if the point is removed
             if (ref.pointRemoved(oldFace[pointI]))
@@ -256,11 +256,11 @@ void Foam::slidingInterface::decoupleInterface
         primitiveMesh::facesPerCell_*(masterPatch.size() + slavePatch.size())
     );
 
-    forAll (slaveFc, faceI)
+    forAll(slaveFc, faceI)
     {
         const labelList& curFaces = cells[slaveFc[faceI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             // Check if the face belongs to the slave face zone; and
             // if it has been removed; if not add it
@@ -283,7 +283,7 @@ void Foam::slidingInterface::decoupleInterface
     // Grab master point mapping
     const Map<label>& masterPm = masterPatch.meshPointMap();
 
-    forAll (slaveStickOuts, faceI)
+    forAll(slaveStickOuts, faceI)
     {
         // Renumber the face and remove additional points
 
@@ -295,7 +295,7 @@ void Foam::slidingInterface::decoupleInterface
 
         bool changed = false;
 
-        forAll (oldFace, pointI)
+        forAll(oldFace, pointI)
         {
             // Check if the point is removed or retired
             if (rpm.found(oldFace[pointI]))
@@ -378,7 +378,7 @@ void Foam::slidingInterface::decoupleInterface
     const labelList& slaveMeshPoints =
         mesh.faceZones()[slaveFaceZoneID_.index()]().meshPoints();
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         ref.setAction
         (
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index 2a4f2f9d69..56e70fbd35 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -68,7 +68,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
     Map<label> mpLookup(2*mp.size());
 
-    forAll (mp, mpI)
+    forAll(mp, mpI)
     {
         mpLookup.insert(mp[mpI], mpI);
     }
@@ -78,7 +78,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
     localFacesPtr_ = new faceList(faces.size());
     faceList& lf = *localFacesPtr_;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         const face& f = faces[faceI];
 
@@ -86,7 +86,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
         curlf.setSize(f.size());
 
-        forAll (f, pointI)
+        forAll(f, pointI)
         {
             curlf[pointI] = mpLookup.find(f[pointI])();
         }
@@ -108,7 +108,7 @@ void Foam::enrichedPatch::calcLocalPoints() const
     localPointsPtr_ = new pointField(mp.size());
     pointField& lp = *localPointsPtr_;
 
-    forAll (lp, i)
+    forAll(lp, i)
     {
         lp[i] = pointMap().find(mp[i])();
     }
@@ -225,11 +225,11 @@ bool Foam::enrichedPatch::checkSupport() const
 
     bool error = false;
 
-    forAll (faces, faceI)
+    forAll(faces, faceI)
     {
         const face& curFace = faces[faceI];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             if (!pointMap().found(curFace[pointI]))
             {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index 7c98aec450..7c3649aad7 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -204,9 +204,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~enrichedPatch();
+    //- Destructor
+    ~enrichedPatch();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 5582f44e82..caee3a88c8 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -99,7 +99,7 @@ void Foam::enrichedPatch::calcCutFaces() const
         (pp.size()*primitiveMesh::edgesPerPoint_);
 
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         const face& curLocalFace = lf[faceI];
         const face& curGlobalFace = enFaces[faceI];
@@ -119,7 +119,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 //         }
 //         {
 //             pointField facePoints = curLocalFace.points(lp);
-//             forAll (curLocalFace, pointI)
+//             forAll(curLocalFace, pointI)
 //             {
 //                 Pout << "v " << facePoints[pointI].x() << " "
 //                     << facePoints[pointI].y() << " "
@@ -141,7 +141,7 @@ void Foam::enrichedPatch::calcCutFaces() const
 
         // Insert the edges of current face into the seed list.
         edgeList cfe = curLocalFace.edges();
-        forAll (curLocalFace, edgeI)
+        forAll(curLocalFace, edgeI)
         {
             edgeSeeds.append(cfe[edgeI]);
         }
@@ -214,7 +214,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                 scalar atanTurn = -GREAT;
                 label bestAtanPoint = -1;
 
-                forAll (nextPoints, nextI)
+                forAll(nextPoints, nextI)
                 {
                     // Exclude the point we are coming from; there will always
                     // be more than one edge, so this is safe
@@ -314,7 +314,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                     // If the edge corresponds to a starting face edge,
                     // mark the starting face edge as true
 
-                    forAll (cutFaceLocal, cutI)
+                    forAll(cutFaceLocal, cutI)
                     {
                         const edge curCutFaceEdge
                         (
@@ -424,9 +424,9 @@ void Foam::enrichedPatch::calcCutFaces() const
 
                                 // For every current face, try to find it in the
                                 // zero-list
-                                forAll (curMasterFaces, i)
+                                forAll(curMasterFaces, i)
                                 {
-                                    forAll (masterFacesOfPZero, j)
+                                    forAll(masterFacesOfPZero, j)
                                     {
                                         if
                                         (
@@ -444,7 +444,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                             // If all point are found attempt matching
                             if (!miss)
                             {
-                                forAll (hits, pointI)
+                                forAll(hits, pointI)
                                 {
                                     if (hits[pointI] == cutFaceGlobal.size())
                                     {
@@ -522,7 +522,7 @@ void Foam::enrichedPatch::calcCutFaces() const
                         faceSizeDebug *= 2;
 
                         // Check for duplicate points in the face
-                        forAll (cutFaceGlobalPoints, checkI)
+                        forAll(cutFaceGlobalPoints, checkI)
                         {
                             for
                             (
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 5197d81022..f92963bb2c 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -84,7 +84,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
     // Add slave faces into the enriched faces list
 
-    forAll (slavePatch_, faceI)
+    forAll(slavePatch_, faceI)
     {
         const face oldFace = slavePatch_[faceI];
         const face oldLocalFace = slaveLocalFaces[faceI];
@@ -95,7 +95,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
         // Note: The number of points and edges in a face is always identical
         // so both can be done is the same loop
-        forAll (oldFace, i)
+        forAll(oldFace, i)
         {
             // Add the point
             Map<label>::const_iterator mpIter =
@@ -166,7 +166,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField slavePosOnEdge(slavePointsOnEdge.size());
 
-                forAll (slavePointsOnEdge, edgePointI)
+                forAll(slavePointsOnEdge, edgePointI)
                 {
                     slavePosOnEdge[edgePointI] =
                         pointMap().find(slavePointsOnEdge[edgePointI])();
@@ -207,7 +207,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     label nextPoint = -1;
                     scalar dist = 2;
 
-                    forAll (edgePointWeights, wI)
+                    forAll(edgePointWeights, wI)
                     {
                         if (edgePointWeights[wI] < dist)
                         {
@@ -239,7 +239,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
     // Add master faces into the enriched faces list
 
-    forAll (masterPatch_, faceI)
+    forAll(masterPatch_, faceI)
     {
         const face& oldFace = masterPatch_[faceI];
         const face& oldLocalFace = masterLocalFaces[faceI];
@@ -250,7 +250,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
         // Note: The number of points and edges in a face is always identical
         // so both can be done is the same loop
-        forAll (oldFace, i)
+        forAll(oldFace, i)
         {
             // Add the point
             Map<label>::const_iterator mpIter =
@@ -317,7 +317,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
                 pointField masterPosOnEdge(masterPointsOnEdge.size());
 
-                forAll (masterPointsOnEdge, edgePointI)
+                forAll(masterPointsOnEdge, edgePointI)
                 {
                     masterPosOnEdge[edgePointI] =
                         pointMap().find(masterPointsOnEdge[edgePointI])();
@@ -358,7 +358,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
                     label nextPoint = -1;
                     scalar dist = 2;
 
-                    forAll (edgePointWeights, wI)
+                    forAll(edgePointWeights, wI)
                     {
                         if (edgePointWeights[wI] < dist)
                         {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index 927ad3047d..3a2d6b2aeb 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -56,11 +56,11 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     const faceList& ef = enrichedFaces();
 
     // Add the original face points
-    forAll (masterPatch_, faceI)
+    forAll(masterPatch_, faceI)
     {
         const face& curFace = ef[faceI + slavePatch_.size()];
 //         Pout << "Cur face in pfAddr: " << curFace << endl;
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             Map<DynamicList<label> >::iterator mpfIter =
                 mpf.find(curFace[pointI]);
@@ -87,7 +87,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     // Add the projected points which hit the face
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
 
-    forAll (slavePointFaceHits_, pointI)
+    forAll(slavePointFaceHits_, pointI)
     {
         if
         (
@@ -132,7 +132,7 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
     masterPointFacesPtr_ = new Map<labelList>(2*mpfToc.size());
     Map<labelList>& masterPointFaceAddr = *masterPointFacesPtr_;
 
-    forAll (mpfToc, mpfTocI)
+    forAll(mpfToc, mpfTocI)
     {
         labelList l;
         l.transfer(mpf.find(mpfToc[mpfTocI])());
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
index f4125b96c0..0fb7b20673 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointMap.C
@@ -47,7 +47,7 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& masterMeshPoints = masterPatch_.meshPoints();
     const pointField& masterLocalPoints = masterPatch_.localPoints();
 
-    forAll (masterMeshPoints, pointI)
+    forAll(masterMeshPoints, pointI)
     {
         if (!pmm.found(masterMeshPoints[pointI]))
         {
@@ -63,7 +63,7 @@ void Foam::enrichedPatch::completePointMap() const
     const labelList& slaveMeshPoints = slavePatch_.meshPoints();
     const pointField& slaveLocalPoints = slavePatch_.localPoints();
 
-    forAll (slaveMeshPoints, pointI)
+    forAll(slaveMeshPoints, pointI)
     {
         if (!pmm.found(slaveMeshPoints[pointI]))
         {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index 96c89fa810..a24586b754 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -53,11 +53,11 @@ void Foam::enrichedPatch::calcPointPoints() const
 
     register bool found = false;
 
-    forAll (lf, faceI)
+    forAll(lf, faceI)
     {
         const face& curFace = lf[faceI];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             DynamicList<label, primitiveMesh::edgesPerPoint_>&
                 curPp = pp[curFace[pointI]];
@@ -67,7 +67,7 @@ void Foam::enrichedPatch::calcPointPoints() const
 
             found = false;
 
-            forAll (curPp, i)
+            forAll(curPp, i)
             {
                 if (curPp[i] == next)
                 {
@@ -85,7 +85,7 @@ void Foam::enrichedPatch::calcPointPoints() const
             label prev = curFace.prevLabel(pointI);
             found = false;
 
-            forAll (curPp, i)
+            forAll(curPp, i)
             {
                 if (curPp[i] == prev)
                 {
@@ -105,7 +105,7 @@ void Foam::enrichedPatch::calcPointPoints() const
     pointPointsPtr_ = new labelListList(pp.size());
     labelListList& ppAddr = *pointPointsPtr_;
 
-    forAll (pp, pointI)
+    forAll(pp, pointI)
     {
         ppAddr[pointI].transfer(pp[pointI]);
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 4720d04344..0382b5a5c6 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -465,7 +465,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
         const pointField& slaveLocalPoints = slavePatch.localPoints();
         const vectorField& slavePointNormals = slavePatch.pointNormals();
 
-        forAll (cutPoints, pointI)
+        forAll(cutPoints, pointI)
         {
             // Try to find the cut point in retired points
             Map<label>::const_iterator rpmIter = rpm.find(cutPoints[pointI]);
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index beccc89f6e..8058d5d4a4 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -340,9 +340,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~slidingInterface();
+    //- Destructor
+    virtual ~slidingInterface();
 
 
     // Member Functions
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index 2831aa8453..e43b23c984 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -64,7 +64,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         masterFaceCellsPtr_ = new labelList(masterPatchFaces.size());
         labelList& mfc = *masterFaceCellsPtr_;
 
-        forAll (masterPatchFaces, faceI)
+        forAll(masterPatchFaces, faceI)
         {
             if (masterFlip[faceI])
             {
@@ -90,7 +90,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         slaveFaceCellsPtr_ = new labelList(slavePatchFaces.size());
         labelList& sfc = *slaveFaceCellsPtr_;
 
-        forAll (slavePatchFaces, faceI)
+        forAll(slavePatchFaces, faceI)
         {
             if (slaveFlip[faceI])
             {
@@ -107,7 +107,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         {
             if (debug)
             {
-                forAll (mfc, faceI)
+                forAll(mfc, faceI)
                 {
                     if (mfc[faceI] < 0)
                     {
@@ -119,7 +119,7 @@ void Foam::slidingInterface::calcAttachedAddressing() const
                     }
                 }
 
-                forAll (sfc, faceI)
+                forAll(sfc, faceI)
                 {
                     if (sfc[faceI] < 0)
                     {
@@ -152,11 +152,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& masterMeshPoints = masterPatch.meshPoints();
 
-        forAll (masterMeshPoints, pointI)
+        forAll(masterMeshPoints, pointI)
         {
             const labelList& curFaces = pointFaces[masterMeshPoints[pointI]];
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 // Check if the face belongs to the master face zone;
                 // if not add it
@@ -181,11 +181,11 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
         const labelList& slaveMeshPoints = slavePatch.meshPoints();
 
-        forAll (slaveMeshPoints, pointI)
+        forAll(slaveMeshPoints, pointI)
         {
             const labelList& curFaces = pointFaces[slaveMeshPoints[pointI]];
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 // Check if the face belongs to the slave face zone;
                 // if not add it
@@ -272,7 +272,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& mfzRenumber =
         m.faceZoneFaceMap()[masterFaceZoneID_.index()];
 
-    forAll (mfc, faceI)
+    forAll(mfc, faceI)
     {
         label newCellI = reverseCellMap[mfc[mfzRenumber[faceI]]];
 
@@ -289,7 +289,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfzRenumber =
         m.faceZoneFaceMap()[slaveFaceZoneID_.index()];
 
-    forAll (sfc, faceI)
+    forAll(sfc, faceI)
     {
         label newCellI = reverseCellMap[sfc[sfzRenumber[faceI]]];
 
@@ -325,7 +325,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     labelList* newMsofPtr = new labelList(msof.size(), -1);
     labelList& newMsof = *newMsofPtr;
 
-    forAll (msof, faceI)
+    forAll(msof, faceI)
     {
         label newFaceI = reverseFaceMap[msof[faceI]];
 
@@ -341,7 +341,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     labelList* newSsofPtr = new labelList(ssof.size(), -1);
     labelList& newSsof = *newSsofPtr;
 
-    forAll (ssof, faceI)
+    forAll(ssof, faceI)
     {
         label newFaceI = reverseFaceMap[ssof[faceI]];
 
@@ -380,7 +380,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
 
     label key, value;
 
-    forAll (rpmToc, rpmTocI)
+    forAll(rpmToc, rpmTocI)
     {
         key = reversePointMap[rpmToc[rpmTocI]];
 
@@ -413,7 +413,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
 
     const labelList cpepmToc = cpepm.toc();
 
-    forAll (cpepmToc, cpepmTocI)
+    forAll(cpepmToc, cpepmTocI)
     {
         key = reversePointMap[cpepmToc[cpepmTocI]];
 
@@ -466,7 +466,7 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfzPointRenumber =
         m.faceZonePointMap()[slaveFaceZoneID_.index()];
 
-    forAll (newProjectedSlavePoints, pointI)
+    forAll(newProjectedSlavePoints, pointI)
     {
         if (sfzPointRenumber[pointI] > -1)
         {
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
index 743d36613d..b89bfbe0e7 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceClearCouple.C
@@ -51,7 +51,7 @@ void Foam::slidingInterface::clearCouple
     const labelList& cutPointZoneLabels =
         mesh.pointZones()[cutPointZoneID_.index()];
 
-    forAll (cutPointZoneLabels, pointI)
+    forAll(cutPointZoneLabels, pointI)
     {
         ref.setAction(polyRemovePoint(cutPointZoneLabels[pointI]));
     }
@@ -60,7 +60,7 @@ void Foam::slidingInterface::clearCouple
     const labelList& cutFaceZoneLabels =
         mesh.faceZones()[cutFaceZoneID_.index()];
 
-    forAll (cutFaceZoneLabels, faceI)
+    forAll(cutFaceZoneLabels, faceI)
     {
         ref.setAction(polyRemoveFace(cutFaceZoneLabels[faceI]));
     }
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index d4c37ebbbe..74ab080d2a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -125,7 +125,7 @@ bool Foam::slidingInterface::projectPoints() const
     scalarField minMasterPointLength(masterLocalPoints.size(), GREAT);
     scalarField minMasterFaceLength(masterPatch.size(), GREAT);
 
-    forAll (masterEdges, edgeI)
+    forAll(masterEdges, edgeI)
     {
         const edge& curEdge = masterEdges[edgeI];
 
@@ -150,7 +150,7 @@ bool Foam::slidingInterface::projectPoints() const
         // Do faces
         const labelList& curFaces = masterEdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             minMasterFaceLength[curFaces[faceI]] =
                 min
@@ -168,7 +168,7 @@ bool Foam::slidingInterface::projectPoints() const
     scalarField minSlavePointLength(slaveLocalPoints.size(), GREAT);
     scalarField minSlaveFaceLength(slavePatch.size(), GREAT);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -193,7 +193,7 @@ bool Foam::slidingInterface::projectPoints() const
         // Do faces
         const labelList& curFaces = slaveEdgeFaces[edgeI];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             minSlaveFaceLength[curFaces[faceI]] =
                 min
@@ -232,7 +232,7 @@ bool Foam::slidingInterface::projectPoints() const
     {
         label nHits = 0;
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -267,7 +267,7 @@ bool Foam::slidingInterface::projectPoints() const
                 << "Adjusting point projection for integral match: ";
         }
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -343,7 +343,7 @@ bool Foam::slidingInterface::projectPoints() const
     }
     else if (matchType_ == PARTIAL)
     {
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if (slavePointFaceHits[pointI].hit())
             {
@@ -385,7 +385,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar el = 0;
         label nShortEdges = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -440,7 +440,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMergedPoints = 0;
 
-    forAll (projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointI)
     {
         if (slavePointFaceHits[pointI].hit())
         {
@@ -455,7 +455,7 @@ bool Foam::slidingInterface::projectPoints() const
             scalar mergeDist = GREAT;
 
             // Try all point before deciding on best fit.
-            forAll (hitFace, hitPointI)
+            forAll(hitFace, hitPointI)
             {
                 scalar dist =
                     mag(masterLocalPoints[hitFace[hitPointI]] - curPoint);
@@ -505,7 +505,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar minEdgeLength = GREAT;
         scalar el = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -540,7 +540,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     label nMovedPoints = 0;
 
-    forAll (projectedSlavePoints, pointI)
+    forAll(projectedSlavePoints, pointI)
     {
         // Eliminate the points merged into points
         if (slavePointPointHits[pointI] < 0)
@@ -564,7 +564,7 @@ bool Foam::slidingInterface::projectPoints() const
 
             scalar minDistance = GREAT;
 
-            forAll (hitFaceEdges, edgeI)
+            forAll(hitFaceEdges, edgeI)
             {
                 const edge& curEdge = masterEdges[hitFaceEdges[edgeI]];
 
@@ -613,7 +613,7 @@ bool Foam::slidingInterface::projectPoints() const
                 label mergePoint = -1;
                 scalar mergeDist = GREAT;
 
-                forAll (hitMasterEdge, hmeI)
+                forAll(hitMasterEdge, hmeI)
                 {
                     scalar hmeDist =
                         mag(masterLocalPoints[hitMasterEdge[hmeI]] - curPoint);
@@ -670,7 +670,7 @@ bool Foam::slidingInterface::projectPoints() const
         scalar minEdgeLength = GREAT;
         scalar el = 0;
 
-        forAll (slaveEdges, edgeI)
+        forAll(slaveEdges, edgeI)
         {
             el = slaveEdges[edgeI].mag(projectedSlavePoints);
 
@@ -758,7 +758,7 @@ bool Foam::slidingInterface::projectPoints() const
 
     labelHashSet addedFaces(2*primitiveMesh::edgesPerFace_);
 
-    forAll (slaveEdges, edgeI)
+    forAll(slaveEdges, edgeI)
     {
         const edge& curEdge = slaveEdges[edgeI];
 
@@ -801,11 +801,11 @@ bool Foam::slidingInterface::projectPoints() const
                 const labelList cf = addedFaces.toc();
                 addedFaces.clear();
 
-                forAll (cf, cfI)
+                forAll(cf, cfI)
                 {
                     const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                    forAll (curNbrs, nbrI)
+                    forAll(curNbrs, nbrI)
                     {
                         if (!curFaceMap.found(curNbrs[nbrI]))
                         {
@@ -852,11 +852,11 @@ bool Foam::slidingInterface::projectPoints() const
                     const labelList cf = addedFaces.toc();
                     addedFaces.clear();
 
-                    forAll (cf, cfI)
+                    forAll(cf, cfI)
                     {
                         const labelList& curNbrs = masterFaceFaces[cf[cfI]];
 
-                        forAll (curNbrs, nbrI)
+                        forAll(curNbrs, nbrI)
                         {
                             if (!curFaceMap.found(curNbrs[nbrI]))
                             {
@@ -900,11 +900,11 @@ bool Foam::slidingInterface::projectPoints() const
 
             const labelList curFaces = curFaceMap.toc();
 //             Pout << "curFaces: " << curFaces << endl;
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 const face& f = masterLocalFaces[curFaces[faceI]];
 
-                forAll (f, pointI)
+                forAll(f, pointI)
                 {
                     curPointMap.insert(f[pointI]);
                 }
@@ -956,7 +956,7 @@ bool Foam::slidingInterface::projectPoints() const
 
             edgeNormalInPlane /= mag(edgeNormalInPlane);
 
-            forAll (curMasterPoints, pointI)
+            forAll(curMasterPoints, pointI)
             {
                 const label cmp = curMasterPoints[pointI];
 
@@ -1185,7 +1185,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         const List<objectHit>& oldPointFaceHits = *slavePointFaceHitsPtr_;
 
-        forAll (slavePointFaceHits, pointI)
+        forAll(slavePointFaceHits, pointI)
         {
             if
             (
diff --git a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
index 8f16a2ee81..bf834be3da 100644
--- a/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
+++ b/src/edgeMesh/edgeFormats/nas/NASedgeFormat.H
@@ -82,10 +82,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~NASedgeFormat()
-        {}
+    //- Destructor
+    virtual ~NASedgeFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
index 694922c094..dec85d6cd9 100644
--- a/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
+++ b/src/edgeMesh/edgeFormats/obj/OBJedgeFormat.H
@@ -86,10 +86,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~OBJedgeFormat()
-        {}
+    //- Destructor
+    virtual ~OBJedgeFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/engine/engineMesh/engineMesh/engineMesh.H b/src/engine/engineMesh/engineMesh/engineMesh.H
index 724edbac98..7eaa3afb29 100644
--- a/src/engine/engineMesh/engineMesh/engineMesh.H
+++ b/src/engine/engineMesh/engineMesh/engineMesh.H
@@ -106,9 +106,8 @@ public:
         static autoPtr<engineMesh> New(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~engineMesh();
+    //- Destructor
+    virtual ~engineMesh();
 
 
     // Member Functions
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
index ef16f0f1aa..343295b6fc 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.H
@@ -82,9 +82,8 @@ public:
         fvMotionSolverEngineMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~fvMotionSolverEngineMesh();
+    //- Destructor
+    ~fvMotionSolverEngineMesh();
 
 
     // Member Functions
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 3f343a1b48..17ce100ed6 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -28,20 +28,18 @@ License
 #include "fvcMeshPhi.H"
 #include "surfaceInterpolate.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(layeredEngineMesh, 0);
+    addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(layeredEngineMesh, 0);
-
-addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-layeredEngineMesh::layeredEngineMesh(const IOobject& io)
+Foam::layeredEngineMesh::layeredEngineMesh(const IOobject& io)
 :
     engineMesh(io),
     pistonLayers_("pistonLayers", dimLength, 0.0)
@@ -55,13 +53,13 @@ layeredEngineMesh::layeredEngineMesh(const IOobject& io)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-layeredEngineMesh::~layeredEngineMesh()
+Foam::layeredEngineMesh::~layeredEngineMesh()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void layeredEngineMesh::move()
+void Foam::layeredEngineMesh::move()
 {
     scalar deltaZ = engineDB_.pistonDisplacement().value();
     Info<< "deltaZ = " << deltaZ << endl;
@@ -71,7 +69,7 @@ void layeredEngineMesh::move()
 
     pointField newPoints = points();
 
-    forAll (newPoints, pointi)
+    forAll(newPoints, pointi)
     {
         point& p = newPoints[pointi];
 
@@ -127,8 +125,4 @@ void layeredEngineMesh::move()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
index 881e4d07b3..2d32a7944c 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.H
@@ -77,9 +77,8 @@ public:
         layeredEngineMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~layeredEngineMesh();
+    //- Destructor
+    ~layeredEngineMesh();
 
 
     // Member Functions
diff --git a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
index 272c9a1137..9dd9b50f2c 100644
--- a/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
+++ b/src/engine/engineMesh/staticEngineMesh/staticEngineMesh.H
@@ -71,9 +71,8 @@ public:
         staticEngineMesh(const IOobject& io);
 
 
-    // Destructor
-
-        ~staticEngineMesh();
+    //- Destructor
+    ~staticEngineMesh();
 
 
     // Member Functions
diff --git a/src/engine/engineTime/engineTime.H b/src/engine/engineTime/engineTime.H
index cef172e902..fd349c7ae2 100644
--- a/src/engine/engineTime/engineTime.H
+++ b/src/engine/engineTime/engineTime.H
@@ -110,10 +110,9 @@ public:
             const fileName& dictName = "engineGeometry"
         );
 
-    // Destructor
-
-        virtual ~engineTime()
-        {}
+    //- Destructor
+    virtual ~engineTime()
+    {}
 
 
     // Member Functions
diff --git a/src/engine/engineValve/valveBank.H b/src/engine/engineValve/valveBank.H
index dc72f0819d..4a4199eaeb 100644
--- a/src/engine/engineValve/valveBank.H
+++ b/src/engine/engineValve/valveBank.H
@@ -74,7 +74,7 @@ public:
 
             setSize(valveEntries.size());
 
-            forAll (valveEntries, valveI)
+            forAll(valveEntries, valveI)
             {
                 valveI,
                 set
diff --git a/src/engine/ignition/ignite.H b/src/engine/ignition/ignite.H
index 3e15c36d15..30faf6aaba 100644
--- a/src/engine/ignition/ignite.H
+++ b/src/engine/ignition/ignite.H
@@ -1,4 +1,4 @@
-    forAll (ign.sites(), i)
+    forAll(ign.sites(), i)
     {
         const ignitionSite& ignSite = ign.sites()[i];
 
diff --git a/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H b/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
index 53a225fb7a..1cf3a7b853 100644
--- a/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
+++ b/src/errorEstimation/errorDrivenRefinement/errorDrivenRefinement.H
@@ -89,9 +89,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~errorDrivenRefinement();
+    //- Destructor
+    virtual ~errorDrivenRefinement();
 
 
     // Member Functions
diff --git a/src/errorEstimation/errorEstimate/errorEstimate.C b/src/errorEstimation/errorEstimate/errorEstimate.C
index b90ef3819d..2a0db1990a 100644
--- a/src/errorEstimation/errorEstimate/errorEstimate.C
+++ b/src/errorEstimation/errorEstimate/errorEstimate.C
@@ -43,7 +43,7 @@ Foam::wordList Foam::errorEstimate<Type>::errorBCTypes() const
         zeroGradientFvPatchField<Type>::typeName
     );
 
-    forAll (psi_.boundaryField(), patchI)
+    forAll(psi_.boundaryField(), patchI)
     {
         if (psi_.boundaryField()[patchI].fixesValue())
         {
diff --git a/src/errorEstimation/errorEstimate/errorEstimate.H b/src/errorEstimation/errorEstimate/errorEstimate.H
index 2e1a7ec54e..9626b97629 100644
--- a/src/errorEstimation/errorEstimate/errorEstimate.H
+++ b/src/errorEstimation/errorEstimate/errorEstimate.H
@@ -94,9 +94,8 @@ public:
         errorEstimate(const errorEstimate<Type>&);
 
 
-    // Destructor
-
-        ~errorEstimate();
+    //- Destructor
+    ~errorEstimate();
 
 
     // Member Functions
diff --git a/src/errorEstimation/errorEstimate/resErrorDiv.C b/src/errorEstimation/errorEstimate/resErrorDiv.C
index 0d1a3f141e..c535a76583 100644
--- a/src/errorEstimation/errorEstimate/resErrorDiv.C
+++ b/src/errorEstimation/errorEstimate/resErrorDiv.C
@@ -66,7 +66,7 @@ div
     > gradVf = fvc::grad(vf);
 
     // Internal faces
-    forAll (owner, faceI)
+    forAll(owner, faceI)
     {
         // Calculate the centre of the face
         const vector& curFaceCentre = faceCentres[faceI];
@@ -96,7 +96,7 @@ div
         aNorm[neighbour[faceI]] -= (1.0 - signF[faceI])*flux[faceI];
     }
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const vectorField& patchFaceCentres =
             faceCentres.boundaryField()[patchI];
@@ -106,7 +106,7 @@ div
 
         const labelList& fCells = patches[patchI].faceCells();
 
-        forAll (fCells, faceI)
+        forAll(fCells, faceI)
         {
             vector d =
                 patchFaceCentres[faceI] - cellCentres[fCells[faceI]];
diff --git a/src/errorEstimation/errorEstimate/resErrorLaplacian.C b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
index 3a2e41711f..821218ee73 100644
--- a/src/errorEstimation/errorEstimate/resErrorLaplacian.C
+++ b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
@@ -140,7 +140,7 @@ laplacian
     > gradVf = fvc::grad(vf);
 
     // Internal faces
-    forAll (owner, faceI)
+    forAll(owner, faceI)
     {
         // Owner
 
@@ -160,7 +160,7 @@ laplacian
 
     }
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const vectorField& patchSf = Sf.boundaryField()[patchI];
         const scalarField& patchMagSf = magSf.boundaryField()[patchI];
@@ -169,7 +169,7 @@ laplacian
 
         const labelList& fCells = patches[patchI].faceCells();
 
-        forAll (fCells, faceI)
+        forAll(fCells, faceI)
         {
             // Subtract diffusion
             res[fCells[faceI]] -=
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
index 195d65dbe6..b8bfefa28f 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.H
@@ -135,9 +135,8 @@ public:
          );
 
 
-    // Destructor
-
-        virtual ~SRFModel();
+    //- Destructor
+    virtual ~SRFModel();
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
index 99034170da..c2959275b3 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.H
@@ -81,9 +81,8 @@ public:
         rpm(const volVectorField& U);
 
 
-    // Destructor
-
-        ~rpm();
+    //- Destructor
+    ~rpm();
 
     // Member functions
 
diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
index 287b0556d6..55a0e3d915 100644
--- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
+++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
@@ -46,7 +46,7 @@ bool Foam::adjustPhi
         scalar fixedMassOut = 0.0;
         scalar adjustableMassOut = 0.0;
 
-        forAll (phi.boundaryField(), patchi)
+        forAll(phi.boundaryField(), patchi)
         {
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             const fvsPatchScalarField& phip = phi.boundaryField()[patchi];
@@ -122,7 +122,7 @@ bool Foam::adjustPhi
                 << exit(FatalError);
         }
 
-        forAll (phi.boundaryField(), patchi)
+        forAll(phi.boundaryField(), patchi)
         {
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             fvsPatchScalarField& phip = phi.boundaryField()[patchi];
diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
index fb6de8d568..46a60ca782 100644
--- a/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZoneTemplates.C
@@ -57,7 +57,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         Udiag[cells[i]] +=
             V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -80,7 +80,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
         scalar isoDragCoeff = tr(dragCoeff);
@@ -104,7 +104,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         AU[cells[i]] = AU[cells[i]]
           + I*(rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2));
@@ -125,7 +125,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         AU[cells[i]] += mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
     }
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
index 75746e1228..c991551b78 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
@@ -119,9 +119,8 @@ public:
         ) const;
 
 
-    // Destructor
-
-        virtual ~slicedFvPatchField<Type>();
+    //- Destructor
+    virtual ~slicedFvPatchField<Type>();
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
index 4986b103ef..306dbeb438 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
@@ -132,9 +132,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~processorFvPatchField();
+    //- Destructor
+    ~processorFvPatchField();
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
index 1ea0489637..1a8720af06 100644
--- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
@@ -254,10 +254,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fvPatchField<Type>()
-        {}
+    //- Destructor
+    virtual ~fvPatchField<Type>()
+    {}
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index d22a936f7f..be3b7c37b6 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -119,9 +119,8 @@ public:
         ) const;
 
 
-    // Destructor
-
-        virtual ~slicedFvsPatchField<Type>();
+    //- Destructor
+    virtual ~slicedFvsPatchField<Type>();
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
index 453f1f36b4..c77420531a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.H
@@ -130,9 +130,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~processorFvsPatchField();
+    //- Destructor
+    ~processorFvsPatchField();
 
 
     // Member functions
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index ef3b0ad166..b98fdcd453 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -244,10 +244,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fvsPatchField<Type>()
-        {}
+    //- Destructor
+    virtual ~fvsPatchField<Type>()
+    {}
 
 
     // Member functions
diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
index c09b03c1f8..405a4da9ef 100644
--- a/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
+++ b/src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
@@ -147,9 +147,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~convectionScheme();
+    //- Destructor
+    virtual ~convectionScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
index aefe24fb66..a5ab514607 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
@@ -126,9 +126,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~d2dt2Scheme();
+    //- Destructor
+    virtual ~d2dt2Scheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
index 40d7e8a40e..71022e571f 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
@@ -113,7 +113,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (U.boundaryField(), patchi)
+    forAll(U.boundaryField(), patchi)
     {
         if (U.boundaryField()[patchi].fixesValue())
         {
@@ -154,7 +154,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (U.boundaryField(), patchi)
+    forAll(U.boundaryField(), patchi)
     {
         if (U.boundaryField()[patchi].fixesValue())
         {
@@ -199,7 +199,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
 
     surfaceScalarField& ddtCouplingCoeff = tddtCouplingCoeff();
 
-    forAll (rhoU.boundaryField(), patchi)
+    forAll(rhoU.boundaryField(), patchi)
     {
         if (rhoU.boundaryField()[patchi].fixesValue())
         {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
index 0c8bf6c4b4..0d421572c9 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
@@ -126,9 +126,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ddtScheme();
+    //- Destructor
+    virtual ~ddtScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
index 26a5cbff6c..affa31e39c 100644
--- a/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
+++ b/src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
@@ -129,9 +129,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~divScheme();
+    //- Destructor
+    virtual ~divScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index cd1c15a1ac..0eb7683d4e 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(extendedLeastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::extendedLeastSquaresVectors, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -160,7 +157,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
     additionalCellsPtr_ = new List<labelPair>(maxNaddCells);
     List<labelPair>& additionalCells_ = *additionalCellsPtr_;
 
-    forAll (detdd, i)
+    forAll(detdd, i)
     {
         label count = 0;
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
index 0ebded6f52..785f1c4a51 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.H
@@ -88,9 +88,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~extendedLeastSquaresVectors();
+    //- Destructor
+    virtual ~extendedLeastSquaresVectors();
 
 
     // Member functions
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index 8fc633292b..4239c522a6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(leastSquaresVectors, 0);
-}
+defineTypeNameAndDebug(Foam::leastSquaresVectors, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -248,7 +245,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
         const surfaceVectorField& Sf = mesh.Sf();
         const surfaceScalarField& w = mesh.weights();
 
-        forAll (dd, celli)
+        forAll(dd, celli)
         {
             if (det(dd[celli]) < 3)
             {
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
index 2d052b46b7..bc98a619df 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.H
@@ -78,9 +78,8 @@ public:
         explicit leastSquaresVectors(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~leastSquaresVectors();
+    //- Destructor
+    virtual ~leastSquaresVectors();
 
 
     // Member functions
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
index 6bdb300c35..7dea92b4d5 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H
@@ -109,10 +109,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~gaussLaplacianScheme()
-        {}
+    //- Destructor
+    virtual ~gaussLaplacianScheme()
+    {}
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
index acb085a4c3..0033c3f96b 100644
--- a/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
+++ b/src/finiteVolume/finiteVolume/laplacianSchemes/laplacianScheme/laplacianScheme.H
@@ -156,9 +156,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~laplacianScheme();
+    //- Destructor
+    virtual ~laplacianScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
index 10dbc9dce7..a4ce513153 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H
@@ -84,9 +84,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~correctedSnGrad();
+    //- Destructor
+    virtual ~correctedSnGrad();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
index d70cfd5dd4..fdbc29855d 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H
@@ -108,9 +108,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~limitedSnGrad();
+    //- Destructor
+    virtual ~limitedSnGrad();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
index 402ade64c7..e837cd22e3 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGrad.H
@@ -97,9 +97,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~quadraticFitSnGrad() {}
+    //- Destructor
+    virtual ~quadraticFitSnGrad() {}
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
index 46d9c3b759..45cda21107 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.H
@@ -97,10 +97,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~quadraticFitSnGradData()
-        {};
+    //- Destructor
+    virtual ~quadraticFitSnGradData()
+    {};
 
 
     // Member functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
index fc85304826..fef3c41832 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H
@@ -111,9 +111,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~snGradScheme();
+    //- Destructor
+    virtual ~snGradScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
index 733920c6ea..5ea5858196 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H
@@ -84,9 +84,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~uncorrectedSnGrad();
+    //- Destructor
+    virtual ~uncorrectedSnGrad();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index fae03f59f7..fcb479465b 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -203,7 +203,7 @@ Foam::fvMatrix<Type>::fvMatrix
     }
 
     // Initialise coupling coefficients
-    forAll (psi.mesh().boundary(), patchI)
+    forAll(psi.mesh().boundary(), patchI)
     {
         internalCoeffs_.set
         (
@@ -348,7 +348,7 @@ Foam::fvMatrix<Type>::fvMatrix
     }
 
     // Initialise coupling coefficients
-    forAll (psi.mesh().boundary(), patchI)
+    forAll(psi.mesh().boundary(), patchI)
     {
         internalCoeffs_.set
         (
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index ad70ea1ef0..748d713a35 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -253,9 +253,8 @@ public:
         fvMatrix(const GeometricField<Type, fvPatchField, volMesh>&, Istream&);
 
 
-    // Destructor
-
-        virtual ~fvMatrix();
+    //- Destructor
+    virtual ~fvMatrix();
 
 
     // Member functions
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 67dfdb4425..2fe12f0317 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -527,7 +527,7 @@ void Foam::MULES::limiter
             }
         }
 
-        forAll (sumlPhip, celli)
+        forAll(sumlPhip, celli)
         {
             sumlPhip[celli] =
                 max(min
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
index 246b8038f6..6a9ed1427c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCECCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~centredCECCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~centredCECCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
index db5118cb76..30e0f47f5e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredCPCCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~centredCPCCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~centredCPCCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
index 2e4be9b242..91c78f0747 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/centredFECCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~centredFECCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~centredFECCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
index 1df77bab41..51262a1d9d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/pureUpwindCFCCellToFaceStencilObject.H
@@ -76,10 +76,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~pureUpwindCFCCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~pureUpwindCFCCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
index 73451fad10..4c11e0c4fe 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~upwindCECCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~upwindCECCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
index 7ea2dd5378..921b165b2c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~upwindCFCCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~upwindCFCCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
index de4502e805..68de8643f2 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCPCCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~upwindCPCCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~upwindCPCCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
index fe97d52a41..e91c7b06ab 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.H
@@ -83,10 +83,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~upwindFECCellToFaceStencilObject()
-        {}
+    //- Destructor
+    virtual ~upwindFECCellToFaceStencilObject()
+    {}
 };
 
 
diff --git a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
index e146c24436..92bb9f42d0 100644
--- a/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
+++ b/src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
@@ -27,14 +27,9 @@ License
 #include "fvBoundaryMesh.H"
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
 {
     setSize(basicBdry.size());
 
@@ -50,7 +45,7 @@ void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
 (
     const fvMesh& m
 )
@@ -60,7 +55,7 @@ fvBoundaryMesh::fvBoundaryMesh
 {}
 
 
-fvBoundaryMesh::fvBoundaryMesh
+Foam::fvBoundaryMesh::fvBoundaryMesh
 (
     const fvMesh& m,
     const polyBoundaryMesh& basicBdry
@@ -75,7 +70,7 @@ fvBoundaryMesh::fvBoundaryMesh
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fvBoundaryMesh::movePoints()
+void Foam::fvBoundaryMesh::movePoints()
 {
     forAll(*this, patchi)
     {
@@ -89,11 +84,11 @@ void fvBoundaryMesh::movePoints()
 }
 
 
-lduInterfacePtrsList fvBoundaryMesh::interfaces() const
+Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const
 {
     lduInterfacePtrsList interfaces(size());
 
-    forAll (interfaces, patchi)
+    forAll(interfaces, patchi)
     {
         if (isA<lduInterface>(this->operator[](patchi)))
         {
@@ -109,15 +104,11 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
 }
 
 
-void fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
+void Foam::fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
 {
     clear();
     addPatches(basicBdry);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index f821234b64..64ea8c4103 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -594,7 +594,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 
     const fvPatchList& patches = boundary();
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         phi.boundaryField()[patchI] = patches[patchI].patchSlice(sweptVols);
         phi.boundaryField()[patchI] *= rDeltaT;
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index 772c30cf9a..68ca4eeed9 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -197,9 +197,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fvMesh();
+    //- Destructor
+    virtual ~fvMesh();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index e0c8a0514e..803a568ead 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -95,17 +95,16 @@ public:
             patchAddr_(mesh.boundary().size()),
             patchSchedule_(mesh.globalData().patchSchedule())
         {
-            forAll (mesh.boundary(), patchI)
+            forAll(mesh.boundary(), patchI)
             {
                 patchAddr_[patchI] = &mesh.boundary()[patchI].faceCells();
             }
         }
 
 
-    // Destructor
-
-        ~fvMeshLduAddressing()
-        {}
+    //- Destructor
+    ~fvMeshLduAddressing()
+    {}
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
index 24caf57a5e..6349467b93 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvBoundaryMeshMapper.H
@@ -72,7 +72,7 @@ public:
         {
             const fvBoundaryMesh& patches = mesh.boundary();
 
-            forAll (patches, patchI)
+            forAll(patches, patchI)
             {
                 set
                 (
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index c3ef265a18..97fa0b64a3 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -70,7 +70,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         // Adjust mapping to manage hits into other patches and into
         // internal
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if
             (
@@ -118,7 +118,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         // Adjust mapping to manage hits into other patches and into
         // internal
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             labelList& curAddr = addr[faceI];
             scalarList& curW = w[faceI];
@@ -130,7 +130,7 @@ void Foam::fvPatchMapper::calcAddressing() const
             )
             {
                 // No adjustment of weights, just subtract patch start
-                forAll (curAddr, i)
+                forAll(curAddr, i)
                 {
                     curAddr[i] -= oldPatchStart;
                 }
@@ -142,7 +142,7 @@ void Foam::fvPatchMapper::calcAddressing() const
                 scalarField newWeights(curAddr.size());
                 label nActive = 0;
 
-                forAll (curAddr, lfI)
+                forAll(curAddr, lfI)
                 {
                     if
                     (
@@ -178,7 +178,7 @@ void Foam::fvPatchMapper::calcAddressing() const
 
         if (fvMesh::debug)
         {
-            forAll (addr, i)
+            forAll(addr, i)
             {
                 if (min(addr[i]) < 0)
                 {
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
index 55addf7351..3cf3baad24 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
@@ -114,9 +114,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fvPatchMapper();
+    //- Destructor
+    virtual ~fvPatchMapper();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index d820d0f245..7baa5836e6 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -64,7 +64,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         labelList& addr = *directAddrPtr_;
 
         // Adjust for creation of an internal face from a boundary face
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (addr[faceI] > oldNInternal)
             {
@@ -90,7 +90,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
         scalarListList& w = *weightsPtr_;
 
         // Adjust for creation of an internal face from a boundary face
-        forAll (addr, faceI)
+        forAll(addr, faceI)
         {
             if (max(addr[faceI]) >= oldNInternal)
             {
@@ -112,7 +112,7 @@ void Foam::fvSurfaceMapper::calcAddressing() const
 
         label nIns = 0;
 
-        forAll (insFaces, faceI)
+        forAll(insFaces, faceI)
         {
             // If the face is internal, keep it here
             if (insFaces[faceI] < size())
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 46e88167fd..5260c91032 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fvSurfaceMapper();
+    //- Destructor
+    virtual ~fvSurfaceMapper();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 36413f9ab3..8cd71ce2c2 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -67,7 +67,7 @@ void Foam::fvMeshSubset::markPoints
     Map<label>& pointMap
 )
 {
-    forAll (curPoints, pointI)
+    forAll(curPoints, pointI)
     {
         // Note: insert will only insert if not yet there.
         pointMap.insert(curPoints[pointI], 0);
@@ -81,7 +81,7 @@ void Foam::fvMeshSubset::markPoints
     labelList& pointMap
 )
 {
-    forAll (curPoints, pointI)
+    forAll(curPoints, pointI)
     {
         pointMap[curPoints[pointI]] = 0;
     }
@@ -103,7 +103,7 @@ void Foam::fvMeshSubset::doCoupledPatches
     if (syncPar && Pstream::parRun())
     {
         // Send face usage across processor patches
-        forAll (oldPatches, oldPatchI)
+        forAll(oldPatches, oldPatchI)
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -125,7 +125,7 @@ void Foam::fvMeshSubset::doCoupledPatches
 
 
         // Receive face usage count and check for faces that become uncoupled.
-        forAll (oldPatches, oldPatchI)
+        forAll(oldPatches, oldPatchI)
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -144,7 +144,7 @@ void Foam::fvMeshSubset::doCoupledPatches
 
                 // Combine with this side.
 
-                forAll (pp, i)
+                forAll(pp, i)
                 {
                     if
                     (
@@ -163,7 +163,7 @@ void Foam::fvMeshSubset::doCoupledPatches
     }
 
     // Do same for cyclics.
-    forAll (oldPatches, oldPatchI)
+    forAll(oldPatches, oldPatchI)
     {
         const polyPatch& pp = oldPatches[oldPatchI];
 
@@ -172,7 +172,7 @@ void Foam::fvMeshSubset::doCoupledPatches
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
 
-            forAll (cycPatch, i)
+            forAll(cycPatch, i)
             {
                 label thisFaceI = cycPatch.start() + i;
                 label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
@@ -405,12 +405,12 @@ void Foam::fvMeshSubset::setCellSubset
 
     Map<label> facesToSubset(avgNFacesPerCell*nCellsInSet);
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         // Mark all faces from the cell
         const labelList& curFaces = oldCells[cellMap_[cellI]];
 
-        forAll (curFaces, faceI)
+        forAll(curFaces, faceI)
         {
             if (!facesToSubset.found(curFaces[faceI]))
             {
@@ -437,7 +437,7 @@ void Foam::fvMeshSubset::setCellSubset
     faceMap_.setSize(facesToc.size());
 
     // 1. Get all faces that will be internal to the submesh.
-    forAll (facesToc, faceI)
+    forAll(facesToc, faceI)
     {
         if (facesToSubset[facesToc[faceI]] == 2)
         {
@@ -528,7 +528,7 @@ void Foam::fvMeshSubset::setCellSubset
     pointMap_ = globalPointMap.toc();
     sort(pointMap_);
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         globalPointMap[pointMap_[pointI]] = pointI;
     }
@@ -542,7 +542,7 @@ void Foam::fvMeshSubset::setCellSubset
 
     label nNewPoints = 0;
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
         nNewPoints++;
@@ -559,7 +559,7 @@ void Foam::fvMeshSubset::setCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -626,7 +626,7 @@ void Foam::fvMeshSubset::setCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -642,13 +642,13 @@ void Foam::fvMeshSubset::setCellSubset
 
     label nNewCells = 0;
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         const labelList& oldC = oldCells[cellMap_[cellI]];
 
         labelList newC(oldC.size());
 
-        forAll (newC, i)
+        forAll(newC, i)
         {
             newC[i] = globalFaceMap[oldC[i]];
         }
@@ -790,7 +790,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
     cellMap_.setSize(oldCells.size());
     label nCellsInSet = 0;
 
-    forAll (region, oldCellI)
+    forAll(region, oldCellI)
     {
         if (region[oldCellI] == currentRegion)
         {
@@ -813,7 +813,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
     labelList nCellsUsingFace(oldFaces.size(), 0);
 
     label nFacesInSet = 0;
-    forAll (oldFaces, oldFaceI)
+    forAll(oldFaces, oldFaceI)
     {
         bool faceUsed = false;
 
@@ -936,7 +936,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         label oldFaceI = oldPatch.start();
 
-        forAll (oldPatch, i)
+        forAll(oldPatch, i)
         {
             if (nCellsUsingFace[oldFaceI] == 1)
             {
@@ -1005,7 +1005,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         label oldFaceI = oldPatch.start();
 
-        forAll (oldPatch, i)
+        forAll(oldPatch, i)
         {
             if (nCellsUsingFace[oldFaceI] == 1)
             {
@@ -1068,7 +1068,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     label nNewPoints = 0;
 
-    forAll (pointMap_, pointI)
+    forAll(pointMap_, pointI)
     {
         newPoints[nNewPoints] = oldPoints[pointMap_[pointI]];
         nNewPoints++;
@@ -1085,7 +1085,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -1120,7 +1120,7 @@ void Foam::fvMeshSubset::setLargeCellSubset
         // Relabel vertices of the (possibly turned) face.
         face newF(oldF.size());
 
-        forAll (newF, i)
+        forAll(newF, i)
         {
             newF[i] = globalPointMap[oldF[i]];
         }
@@ -1136,13 +1136,13 @@ void Foam::fvMeshSubset::setLargeCellSubset
 
     label nNewCells = 0;
 
-    forAll (cellMap_, cellI)
+    forAll(cellMap_, cellI)
     {
         const labelList& oldC = oldCells[cellMap_[cellI]];
 
         labelList newC(oldC.size());
 
-        forAll (newC, i)
+        forAll(newC, i)
         {
             newC[i] = globalFaceMap[oldC[i]];
         }
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index 18609a236c..1c881f8dea 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -93,10 +93,9 @@ public:
                 directAddressing_(directAddressing)
             {}
 
-        // Destructor
-
-            virtual ~patchFieldSubset()
-            {}
+        //- Destructor
+        virtual ~patchFieldSubset()
+        {}
 
 
         // Member Functions
@@ -135,10 +134,9 @@ public:
                 directAddressing_(directAddressing)
             {}
 
-        // Destructor
-
-            virtual ~pointPatchFieldSubset()
-            {}
+        //- Destructor
+        virtual ~pointPatchFieldSubset()
+        {}
 
 
         // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index e6afee8dcf..4a7078723c 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -51,7 +51,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh> > fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<fvPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
@@ -175,7 +175,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<fvsPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
@@ -308,7 +308,7 @@ fvMeshSubset::interpolate
     // Create and map the patch field values
     PtrList<pointPatchField<Type> > patchFields(patchMap.size());
 
-    forAll (patchFields, patchI)
+    forAll(patchFields, patchI)
     {
         // Set the first one by hand as it corresponds to the
         // exposed internal faces.  Additional interpolation can be put here
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 1ebfe11bc2..013c3aa2ac 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -89,9 +89,8 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~coupledFvPatch();
+    //- Destructor
+    virtual ~coupledFvPatch();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 65cb947b6a..c546459875 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -114,7 +114,7 @@ tmp<vectorField> fvPatch::Cn() const
     // get reference to global cell centres
     const vectorField& gcc = boundaryMesh().mesh().cellCentres();
 
-    forAll (faceCells, faceI)
+    forAll(faceCells, faceI)
     {
         cc[faceI] = gcc[faceCells[faceI]];
     }
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 8bb0cf0cd4..1b57ab0601 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -131,9 +131,8 @@ public:
         static autoPtr<fvPatch> New(const polyPatch&, const fvBoundaryMesh&);
 
 
-    // Destructor
-
-        virtual ~fvPatch();
+    //- Destructor
+    virtual ~fvPatch();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist.H b/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
index 326e1d1f79..205adb71ae 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist.H
@@ -80,9 +80,8 @@ public:
         nearWallDist(const fvMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~nearWallDist();
+    //- Destructor
+    virtual ~nearWallDist();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
index 57f230a2cf..30e7abfd52 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.H
@@ -80,9 +80,8 @@ public:
         nearWallDistNoSearch(const fvMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~nearWallDistNoSearch();
+    //- Destructor
+    virtual ~nearWallDistNoSearch();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist.H
index 6c899965ea..5528707780 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.H
@@ -113,9 +113,8 @@ public:
         wallDist(const fvMesh& mesh, bool correctWalls = true);
 
 
-    // Destructor
-
-        virtual ~wallDist();
+    //- Destructor
+    virtual ~wallDist();
 
 
     // Member Functions
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistData.H b/src/finiteVolume/fvMesh/wallDist/wallDistData.H
index e3f8d04881..102a76998b 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDistData.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistData.H
@@ -103,9 +103,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~wallDistData();
+    //- Destructor
+    virtual ~wallDistData();
 
 
     // Member Functions
diff --git a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
index 25d209e80d..c82eadbe87 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolation/interpolation.H
@@ -113,10 +113,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~interpolation()
-        {}
+    //- Destructor
+    virtual ~interpolation()
+    {}
 
 
     // Member Functions
diff --git a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
index b3c314c8ef..aeaaaf020a 100644
--- a/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
+++ b/src/finiteVolume/interpolation/mapping/fvFieldMappers/MapFvSurfaceField.H
@@ -83,7 +83,7 @@ void MapInternalField<Type, MeshMapper, surfaceMesh>::operator()
     // Flip the flux
     const labelList flipFaces = mapper.surfaceMap().flipFaceFlux().toc();
 
-    forAll (flipFaces, i)
+    forAll(flipFaces, i)
     {
         if (flipFaces[i] < field.size())
         {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
index d2f953238a..d945c8864a 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.H
@@ -156,9 +156,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~limitedSurfaceInterpolationScheme();
+    //- Destructor
+    virtual ~limitedSurfaceInterpolationScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
index 43ff440955..45cd10d3db 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/multivariateSchemes/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationScheme.H
@@ -142,9 +142,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~multivariateSurfaceInterpolationScheme();
+    //- Destructor
+    virtual ~multivariateSurfaceInterpolationScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
index 5a005b8a38..525b63a6e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/clippedLinear/clippedLinear.H
@@ -155,7 +155,7 @@ public:
             clippedLinearWeights.internalField() =
                 max(min(cdWeights.internalField(), 1 - wfLimit_), wfLimit_);
 
-            forAll (mesh.boundary(), patchi)
+            forAll(mesh.boundary(), patchi)
             {
                 if (mesh.boundary()[patchi].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
index f6c01aabd1..934f3739c4 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H
@@ -169,7 +169,7 @@ public:
                 );
             }
 
-            forAll (sfCorr.boundaryField(), pi)
+            forAll(sfCorr.boundaryField(), pi)
             {
                 if (!sfCorr.boundaryField()[pi].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
index f250150bd6..23b12d051f 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/reverseLinear/reverseLinear.H
@@ -127,7 +127,7 @@ public:
             reverseLinearWeights.internalField() =
                 1.0 - cdWeights.internalField();
 
-            forAll (mesh.boundary(), patchI)
+            forAll(mesh.boundary(), patchI)
             {
                 if (mesh.boundary()[patchI].coupled())
                 {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
index 9806b348ae..c20ae3ab14 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.H
@@ -76,9 +76,8 @@ public:
         explicit skewCorrectionVectors(const fvMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~skewCorrectionVectors();
+    //- Destructor
+    virtual ~skewCorrectionVectors();
 
 
     // Member functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
index d3380c1c1c..3acac2b2d6 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.H
@@ -106,9 +106,8 @@ public:
         explicit surfaceInterpolation(const fvMesh&);
 
 
-    // Destructor
-
-        ~surfaceInterpolation();
+    //- Destructor
+    ~surfaceInterpolation();
 
 
     // Member functions
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 2d3bdf425e..0a51f574f1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -213,7 +213,7 @@ surfaceInterpolationScheme<Type>::interpolate
 
     // Interpolate across coupled patches using given lambdas and ys
 
-    forAll (lambdas.boundaryField(), pi)
+    forAll(lambdas.boundaryField(), pi)
     {
         const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
         const fvsPatchScalarField& pY = ys.boundaryField()[pi];
@@ -291,7 +291,7 @@ surfaceInterpolationScheme<Type>::interpolate
 
     // Interpolate across coupled patches using given lambdas
 
-    forAll (lambdas.boundaryField(), pi)
+    forAll(lambdas.boundaryField(), pi)
     {
         const fvsPatchScalarField& pLambda = lambdas.boundaryField()[pi];
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
index 26cee56de0..90cd007b63 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.H
@@ -133,9 +133,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~surfaceInterpolationScheme();
+    //- Destructor
+    virtual ~surfaceInterpolationScheme();
 
 
     // Member Functions
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index cc4a515381..fb46d50a87 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -152,9 +152,8 @@ public:
         explicit volPointInterpolation(const fvMesh&);
 
 
-    // Destructor
-
-        ~volPointInterpolation();
+    //- Destructor
+    ~volPointInterpolation();
 
 
     // Member functions
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 4f41fdc2a8..f310615f82 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -56,12 +56,12 @@ makeCompactCellFaceAddressingAndFaceWeights
     // Number of neighbours for each cell
     labelList nNbrs(nFineCells, 0);
 
-    forAll (upperAddr, facei)
+    forAll(upperAddr, facei)
     {
         nNbrs[upperAddr[facei]]++;
     }
 
-    forAll (lowerAddr, facei)
+    forAll(lowerAddr, facei)
     {
         nNbrs[lowerAddr[facei]]++;
     }
@@ -73,7 +73,7 @@ makeCompactCellFaceAddressingAndFaceWeights
 
 
     cellCellOffsets[0] = 0;
-    forAll (nNbrs, celli)
+    forAll(nNbrs, celli)
     {
         cellCellOffsets[celli+1] = cellCellOffsets[celli] + nNbrs[celli];
     }
@@ -81,7 +81,7 @@ makeCompactCellFaceAddressingAndFaceWeights
     // reset the whole list to use as counter
     nNbrs = 0;
 
-    forAll (upperAddr, facei)
+    forAll(upperAddr, facei)
     {
         label own = upperAddr[facei];
         label nei = lowerAddr[facei];
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 094c815a32..ffa5334127 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementSBRStressFvMotionSolver();
+    //- Destructor
+    ~displacementSBRStressFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index 36cadb837e..7aac7096da 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -114,9 +114,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementComponentLaplacianFvMotionSolver();
+    //- Destructor
+    ~displacementComponentLaplacianFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
index 125a868caa..14b2bd1986 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
@@ -84,9 +84,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementFvMotionSolver();
+    //- Destructor
+    ~displacementFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
index 399a9b99ce..3c4f626889 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
@@ -119,9 +119,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementInterpolationFvMotionSolver();
+    //- Destructor
+    ~displacementInterpolationFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index a66dc0b1e5..55cd442b95 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -102,9 +102,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementLaplacianFvMotionSolver();
+    //- Destructor
+    ~displacementLaplacianFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
index 4c6fdb6cc1..0fa540d3dd 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionFvMotionSolver.H
@@ -145,9 +145,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~displacementLayeredMotionFvMotionSolver();
+    //- Destructor
+    ~displacementLayeredMotionFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
index dd6fbe6c7e..6cc71bf355 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
@@ -90,9 +90,8 @@ public:
         fvMotionSolver(const polyMesh& mesh);
 
 
-    // Destructor
-
-        virtual ~fvMotionSolver();
+    //- Destructor
+    virtual ~fvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index 8dd8a98a16..f20423e932 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -100,9 +100,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~velocityComponentLaplacianFvMotionSolver();
+    //- Destructor
+    ~velocityComponentLaplacianFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index fa31853737..bab48d1db2 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~velocityLaplacianFvMotionSolver();
+    //- Destructor
+    ~velocityLaplacianFvMotionSolver();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
index 08472e02f6..789f51987c 100644
--- a/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/directional/directionalDiffusivity.H
@@ -80,9 +80,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~directionalDiffusivity();
+    //- Destructor
+    virtual ~directionalDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
index 2f89d9d2b4..c22170b045 100644
--- a/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/file/fileDiffusivity.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fileDiffusivity();
+    //- Destructor
+    virtual ~fileDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
index a02cd90112..6fc24af870 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~inverseDistanceDiffusivity();
+    //- Destructor
+    virtual ~inverseDistanceDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 3132bb1f85..2ef5a2a1fc 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
 
     label nPatchFaces = 0;
 
-    forAll (patchNames_, i)
+    forAll(patchNames_, i)
     {
         label pID = bdry.findPatchID(patchNames_[i]);
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
index 7aba8045a7..11aee5a400 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.H
@@ -81,9 +81,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~inverseFaceDistanceDiffusivity();
+    //- Destructor
+    virtual ~inverseFaceDistanceDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 6e93d1d792..ec47a05a6c 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -76,7 +76,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
 
     label nPatchEdges = 0;
 
-    forAll (patchNames_, i)
+    forAll(patchNames_, i)
     {
         label pID = bdry.findPatchID(patchNames_[i]);
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
index 928a7bf15c..f874a4edbf 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.H
@@ -81,9 +81,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~inversePointDistanceDiffusivity();
+    //- Destructor
+    virtual ~inversePointDistanceDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
index 3c1d129fa5..5d5918f681 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.H
@@ -75,9 +75,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~inverseVolumeDiffusivity();
+    //- Destructor
+    virtual ~inverseVolumeDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
index e919a01c6d..387d4f23b9 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/exponential/exponentialDiffusivity.H
@@ -82,9 +82,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~exponentialDiffusivity();
+    //- Destructor
+    virtual ~exponentialDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
index 6e799874c5..5706c28250 100644
--- a/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/manipulators/quadratic/quadraticDiffusivity.H
@@ -81,9 +81,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~quadraticDiffusivity();
+    //- Destructor
+    virtual ~quadraticDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
index 028a4bcdb2..68b0d5d67c 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.H
@@ -91,9 +91,8 @@ public:
         motionDiffusivity(const fvMotionSolver& mSolver);
 
 
-    // Destructor
-
-        virtual ~motionDiffusivity();
+    //- Destructor
+    virtual ~motionDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
index 54505bcca3..912166b94d 100644
--- a/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/motionDirectional/motionDirectionalDiffusivity.H
@@ -80,9 +80,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~motionDirectionalDiffusivity();
+    //- Destructor
+    virtual ~motionDirectionalDiffusivity();
 
 
     // Member Functions
diff --git a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
index 9552ced835..fe3125be2e 100644
--- a/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/uniform/uniformDiffusivity.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~uniformDiffusivity();
+    //- Destructor
+    virtual ~uniformDiffusivity();
 
 
     // Member Functions
diff --git a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
index d842671b8d..aeddeb7ddd 100644
--- a/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
+++ b/src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
@@ -81,12 +81,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
             << exit(FatalIOError);
     }
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type" && iter().keyword() != "value")
         {
@@ -459,34 +454,39 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
     actualTypeName_(ptf.actualTypeName_),
     dict_(ptf.dict_)
 {
-    for
+    forAllConstIter
     (
-        HashPtrTable<scalarField>::const_iterator iter =
-            ptf.scalarFields_.begin();
-        iter != ptf.scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        ptf.scalarFields_,
+        iter
     )
     {
-        scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+        scalarFields_.insert
+        (
+            iter.key(),
+            new scalarField(*iter(), mapper)
+        );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<vectorField>::const_iterator iter =
-            ptf.vectorFields_.begin();
-        iter != ptf.vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        ptf.vectorFields_,
+        iter
     )
     {
-        vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+        vectorFields_.insert
+        (
+            iter.key(),
+            new vectorField(*iter(), mapper)
+        );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<sphericalTensorField>::const_iterator iter =
-            ptf.sphericalTensorFields_.begin();
-        iter != ptf.sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        ptf.sphericalTensorFields_,
+        iter
     )
     {
         sphericalTensorFields_.insert
@@ -496,12 +496,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<symmTensorField>::const_iterator iter =
-            ptf.symmTensorFields_.begin();
-        iter != ptf.symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        ptf.symmTensorFields_,
+        iter
     )
     {
         symmTensorFields_.insert
@@ -511,15 +510,18 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<tensorField>::const_iterator iter =
-            ptf.tensorFields_.begin();
-        iter != ptf.tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        ptf.tensorFields_,
+        iter
     )
     {
-        tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+        tensorFields_.insert
+        (
+            iter.key(),
+            new tensorField(*iter(), mapper)
+        );
     }
 }
 
@@ -569,53 +571,51 @@ void Foam::genericFvPatchField<Type>::autoMap
 {
     calculatedFvPatchField<Type>::autoMap(m);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
@@ -635,11 +635,11 @@ void Foam::genericFvPatchField<Type>::rmap
     const genericFvPatchField<Type>& dptf =
         refCast<const genericFvPatchField<Type> >(ptf);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -651,11 +651,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -667,12 +667,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -684,12 +683,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -701,11 +699,11 @@ void Foam::genericFvPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -817,12 +815,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type" && iter().keyword() != "value")
         {
diff --git a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
index f8a0c8b608..ce09fbef75 100644
--- a/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
+++ b/src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
@@ -62,12 +62,7 @@ genericPointPatchField<Type>::genericPointPatchField
     actualTypeName_(dict.lookup("type")),
     dict_(dict)
 {
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type")
         {
@@ -357,34 +352,39 @@ genericPointPatchField<Type>::genericPointPatchField
     actualTypeName_(ptf.actualTypeName_),
     dict_(ptf.dict_)
 {
-    for
+    forAllConstIter
     (
-        HashPtrTable<scalarField>::const_iterator iter =
-            ptf.scalarFields_.begin();
-        iter != ptf.scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        ptf.scalarFields_,
+        iter
     )
     {
-        scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
+        scalarFields_.insert
+        (
+            iter.key(),
+            new scalarField(*iter(), mapper)
+        );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<vectorField>::const_iterator iter =
-            ptf.vectorFields_.begin();
-        iter != ptf.vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        ptf.vectorFields_,
+        iter
     )
     {
-        vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
+        vectorFields_.insert
+        (
+            iter.key(),
+            new vectorField(*iter(), mapper)
+        );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<sphericalTensorField>::const_iterator iter =
-            ptf.sphericalTensorFields_.begin();
-        iter != ptf.sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        ptf.sphericalTensorFields_,
+        iter
     )
     {
         sphericalTensorFields_.insert
@@ -394,12 +394,11 @@ genericPointPatchField<Type>::genericPointPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<symmTensorField>::const_iterator iter =
-            ptf.symmTensorFields_.begin();
-        iter != ptf.symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        ptf.symmTensorFields_,
+        iter
     )
     {
         symmTensorFields_.insert
@@ -409,15 +408,18 @@ genericPointPatchField<Type>::genericPointPatchField
         );
     }
 
-    for
+    forAllConstIter
     (
-        HashPtrTable<tensorField>::const_iterator iter =
-            ptf.tensorFields_.begin();
-        iter != ptf.tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        ptf.tensorFields_,
+        iter
     )
     {
-        tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
+        tensorFields_.insert
+        (
+            iter.key(),
+            new tensorField(*iter(), mapper)
+        );
     }
 }
 
@@ -448,53 +450,51 @@ void genericPointPatchField<Type>::autoMap
     const pointPatchFieldMapper& m
 )
 {
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         iter()->autoMap(m);
@@ -512,11 +512,11 @@ void genericPointPatchField<Type>::rmap
     const genericPointPatchField<Type>& dptf =
         refCast<const genericPointPatchField<Type> >(ptf);
 
-    for
+    forAllIter
     (
-        HashPtrTable<scalarField>::iterator iter = scalarFields_.begin();
-        iter != scalarFields_.end();
-        ++iter
+        HashPtrTable<scalarField>,
+        scalarFields_,
+        iter
     )
     {
         HashPtrTable<scalarField>::const_iterator dptfIter =
@@ -528,11 +528,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<vectorField>::iterator iter = vectorFields_.begin();
-        iter != vectorFields_.end();
-        ++iter
+        HashPtrTable<vectorField>,
+        vectorFields_,
+        iter
     )
     {
         HashPtrTable<vectorField>::const_iterator dptfIter =
@@ -544,12 +544,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<sphericalTensorField>::iterator iter =
-            sphericalTensorFields_.begin();
-        iter != sphericalTensorFields_.end();
-        ++iter
+        HashPtrTable<sphericalTensorField>,
+        sphericalTensorFields_,
+        iter
     )
     {
         HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@@ -561,12 +560,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<symmTensorField>::iterator iter =
-            symmTensorFields_.begin();
-        iter != symmTensorFields_.end();
-        ++iter
+        HashPtrTable<symmTensorField>,
+        symmTensorFields_,
+        iter
     )
     {
         HashPtrTable<symmTensorField>::const_iterator dptfIter =
@@ -578,11 +576,11 @@ void genericPointPatchField<Type>::rmap
         }
     }
 
-    for
+    forAllIter
     (
-        HashPtrTable<tensorField>::iterator iter = tensorFields_.begin();
-        iter != tensorFields_.end();
-        ++iter
+        HashPtrTable<tensorField>,
+        tensorFields_,
+        iter
     )
     {
         HashPtrTable<tensorField>::const_iterator dptfIter =
@@ -601,12 +599,7 @@ void genericPointPatchField<Type>::write(Ostream& os) const
 {
     os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
 
-    for
-    (
-        dictionary::const_iterator iter = dict_.begin();
-        iter != dict_.end();
-        ++iter
-    )
+    forAllConstIter(dictionary, dict_, iter)
     {
         if (iter().keyword() != "type")
         {
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 3c31c1f807..ef43828c4c 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -227,12 +227,7 @@ void Foam::Cloud<ParticleType>::move(TrackingData& td)
                     typename ParticleType::iNew(*this)
                 );
 
-                forAllIter
-                (
-                    typename Cloud<ParticleType>,
-                    newParticles,
-                    newpIter
-                )
+                forAllIter(typename Cloud<ParticleType>, newParticles, newpIter)
                 {
                     ParticleType& newp = newpIter();
                     newp.correctAfterParallelTransfer(patchi, td);
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index db9d84c7f8..8879ae2e7d 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -198,9 +198,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~spray();
+    //- Destructor
+    ~spray();
 
 
     // Member Functions
diff --git a/src/lagrangian/dieselSpray/spray/sprayFunctions.C b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
index 5ff3d5336a..ab4460e938 100644
--- a/src/lagrangian/dieselSpray/spray/sprayFunctions.C
+++ b/src/lagrangian/dieselSpray/spray/sprayFunctions.C
@@ -37,7 +37,7 @@ scalar spray::injectedMass(const scalar t) const
 {
     scalar sum = 0.0;
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         sum += injectors_[i].properties()->injectedMass(t);
     }
@@ -50,7 +50,7 @@ scalar spray::totalMassToInject() const
 {
     scalar sum = 0.0;
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         sum += injectors_[i].properties()->mass();
     }
@@ -67,7 +67,7 @@ scalar spray::injectedEnthalpy
     scalar sum = 0.0;
     label Nf = fuels_->components().size();
 
-    forAll (injectors_, i)
+    forAll(injectors_, i)
     {
         scalar T = injectors_[i].properties()->T(time);
         scalarField X(injectors_[i].properties()->X());
@@ -93,14 +93,9 @@ scalar spray::liquidMass() const
 {
     scalar sum = 0.0;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        sum += elmnt().m();
+        sum += iter().m();
     }
 
     if (twoD())
@@ -119,30 +114,25 @@ scalar spray::liquidEnthalpy() const
     scalar sum = 0.0;
     label Nf = fuels().components().size();
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        scalar T = elmnt().T();
-        scalar pc = p()[elmnt().cell()];
-        scalar hlat = fuels().hl(pc, T, elmnt().X());
+        scalar T = iter().T();
+        scalar pc = p()[iter().cell()];
+        scalar hlat = fuels().hl(pc, T, iter().X());
         scalar hg = 0.0;
-        scalar Wl = fuels().W(elmnt().X());
+        scalar Wl = fuels().W(iter().X());
 
         for (label j=0; j<Nf; j++)
         {
             label k = liquidToGasIndex_[j];
 
             hg +=
-                gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+                gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
                /Wl;
         }
 
         scalar h = hg - hlat;
-        sum += elmnt().m()*h;
+        sum += iter().m()*h;
     }
 
     if (twoD())
@@ -161,33 +151,28 @@ scalar spray::liquidTotalEnthalpy() const
     scalar sum = 0.0;
     label Nf = fuels().components().size();
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        label celli = elmnt().cell();
-        scalar T = elmnt().T();
+        label celli = iter().cell();
+        scalar T = iter().T();
         scalar pc = p()[celli];
-        scalar rho = fuels().rho(pc, T, elmnt().X());
-        scalar hlat = fuels().hl(pc, T, elmnt().X());
+        scalar rho = fuels().rho(pc, T, iter().X());
+        scalar hlat = fuels().hl(pc, T, iter().X());
         scalar hg = 0.0;
-        scalar Wl = fuels().W(elmnt().X());
+        scalar Wl = fuels().W(iter().X());
 
         for (label j=0; j<Nf; j++)
         {
             label k = liquidToGasIndex_[j];
             hg +=
-                gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j]
+                gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
                /Wl;
         }
 
-        scalar psat = fuels().pv(pc, T, elmnt().X());
+        scalar psat = fuels().pv(pc, T, iter().X());
 
         scalar h = hg - hlat + (pc - psat)/rho;
-        sum += elmnt().m()*h;
+        sum += iter().m()*h;
     }
 
     if (twoD())
@@ -204,15 +189,11 @@ scalar spray::liquidTotalEnthalpy() const
 scalar spray::liquidKineticEnergy() const
 {
     scalar sum = 0.0;
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+
+    forAllConstIter(spray, *this, iter)
     {
-        scalar ke = pow(mag(elmnt().U()), 2.0);
-        sum += elmnt().m()*ke;
+        const scalar ke = pow(mag(iter().U()), 2.0);
+        sum += iter().m()*ke;
     }
 
     if (twoD())
@@ -286,13 +267,13 @@ scalar spray::liquidPenetration
 
         for
         (
-            spray::const_iterator elmnt = ++first;
-            elmnt != end();
-            ++elmnt
+            spray::const_iterator iter = ++first;
+            iter != end();
+            ++iter
         )
         {
-            scalar de = mag(elmnt().position() - ip);
-            scalar me = elmnt().m();
+            scalar de = mag(iter().position() - ip);
+            scalar me = iter().m();
             mTot += me;
 
             n++;
@@ -357,8 +338,8 @@ scalar spray::liquidPenetration
     {
         if (Np > 0)
         {
-            spray::const_iterator elmnt = begin();
-            d = mag(elmnt().position() - ip);
+            spray::const_iterator iter = begin();
+            d = mag(iter().position() - ip);
         }
     }
 
@@ -372,20 +353,15 @@ scalar spray::smd() const
 {
     scalar numerator = 0.0, denominator = VSMALL;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        label celli = elmnt().cell();
+        label celli = iter().cell();
         scalar Pc = p()[celli];
-        scalar T = elmnt().T();
-        scalar rho = fuels_->rho(Pc, T, elmnt().X());
+        scalar T = iter().T();
+        scalar rho = fuels_->rho(Pc, T, iter().X());
 
-        scalar tmp = elmnt().N(rho)*pow(elmnt().d(), 2.0);
-        numerator += tmp*elmnt().d();
+        scalar tmp = iter().N(rho)*pow(iter().d(), 2.0);
+        numerator += tmp*iter().d();
         denominator += tmp;
     }
 
@@ -400,14 +376,9 @@ scalar spray::maxD() const
 {
     scalar maxD = 0.0;
 
-    for
-    (
-        spray::const_iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllConstIter(spray, *this, iter)
     {
-        maxD = max(maxD, elmnt().d());
+        maxD = max(maxD, iter().d());
     }
 
     reduce(maxD, maxOp<scalar>());
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 3449fd2612..7a7b026099 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -33,12 +33,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void spray::evolve()
+void Foam::spray::evolve()
 {
     sms_.setSize(rho_.size());
     shs_.setSize(rho_.size());
@@ -71,7 +66,7 @@ void spray::evolve()
 }
 
 
-void spray::move()
+void Foam::spray::move()
 {
     // Reset Spray Source Terms
     sms_ = vector::zero;
@@ -85,9 +80,9 @@ void spray::move()
 }
 
 
-void spray::breakupLoop()
+void Foam::spray::breakupLoop()
 {
-    forAllIter(spray::iterator, *this, elmnt)
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
@@ -119,9 +114,9 @@ void spray::breakupLoop()
 }
 
 
-void spray::atomizationLoop()
+void Foam::spray::atomizationLoop()
 {
-    forAllIter(spray::iterator, *this, elmnt)
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
@@ -145,8 +140,4 @@ void spray::atomizationLoop()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 537bdeb457..27b800b9a4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -86,7 +86,7 @@ void Foam::LISA::atomizeParcel
     scalar Taverage = p.T() + (temperature - p.T())/3.0;
     scalar Winv = 0.0;
 
-    forAll (Y, i)
+    forAll(Y, i)
     {
         Winv += Y[i][cellI]/spray_.gasProperties()[i].W();
     }
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
index fe27140feb..5c836f2eaf 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H
@@ -64,7 +64,7 @@ public:
         noBreakup(const dictionary& dict, spray& sm);
 
 
-    // Destructor
+    //- Destructor
     virtual ~noBreakup();
 
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index 83136134d0..c0ca1a42f9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
@@ -74,20 +74,15 @@ void Foam::gradientDispersionRAS::disperseParcels() const
     const volScalarField& epsilon = turbulence().epsilon();
     const volVectorField& U = spray_.U();
 
-    for
-    (
-        spray::iterator elmnt = spray_.begin();
-        elmnt != spray_.end();
-        ++elmnt
-    )
+    forAllIter(spray, spray_, elmnt)
     {
-        label celli = elmnt().cell();
-        scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+        const label cellI = elmnt().cell();
+        scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
 
         scalar Tturb = min
         (
-            k[celli]/epsilon[celli],
-            cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+            k[cellI]/epsilon[cellI],
+            cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
         );
         // parcel is perturbed by the turbulence
         if (dt < Tturb)
@@ -98,8 +93,8 @@ void Foam::gradientDispersionRAS::disperseParcels() const
             {
                 elmnt().tTurb() = 0.0;
 
-                scalar sigma = sqrt(2.0*k[celli]/3.0);
-                vector dir = -gradk[celli]/(mag(gradk[celli]) + SMALL);
+                scalar sigma = sqrt(2.0*k[cellI]/3.0);
+                vector dir = -gradk[cellI]/(mag(gradk[cellI]) + SMALL);
 
                 // numerical recipes... Ch. 7. Random Numbers...
                 scalar x1 = 0.0;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index a8a01af486..f18136ceb7 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
@@ -75,20 +75,15 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
     const volScalarField& epsilon = turbulence().epsilon();
     const volVectorField& U = spray_.U();
 
-    for
-    (
-        spray::iterator elmnt = spray_.begin();
-        elmnt != spray_.end();
-        ++elmnt
-    )
+    forAllIter(spray, spray_, elmnt)
     {
-        label celli = elmnt().cell();
-        scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb());
+        const label cellI = elmnt().cell();
+        scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
 
         scalar Tturb = min
         (
-            k[celli]/epsilon[celli],
-            cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
+            k[cellI]/epsilon[cellI],
+            cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
         );
 
         // parcel is perturbed by the turbulence
@@ -100,7 +95,7 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
             {
                 elmnt().tTurb() = 0.0;
 
-                scalar sigma = sqrt(2.0*k[celli]/3.0);
+                scalar sigma = sqrt(2.0*k[cellI]/3.0);
                 vector dir = 2.0*spray_.rndGen().vector01() - one;
                 dir /= mag(dir) + SMALL;
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
index bd18ee452a..6343f44c28 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -94,7 +94,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~BinaryCollisionModel();
 
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index 66e35350a4..ffa6533b50 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -83,7 +83,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~LarsenBorgnakkeVariableHardSphere();
 
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index ad7d336e6c..a2477cc26b 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -68,7 +68,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~VariableHardSphere();
 
 
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
index c3d20c584b..19726f5495 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -87,7 +87,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~FreeStream();
 
 
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index 260216f273..cb07db9aeb 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -63,7 +63,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~NoInflow();
 
 
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index 8ca5fb808e..dc5710f6c6 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
@@ -64,7 +64,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~MaxwellianThermal();
 
 
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index 57d0309ccf..c6d8f57277 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
@@ -70,7 +70,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~MixedDiffuseSpecular();
 
 
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
index 6314b3edb9..23fe12b1f5 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
@@ -63,7 +63,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~SpecularReflection();
 
 
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index c638e6bdbb..dbf6eabb91 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -94,7 +94,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~WallInteractionModel();
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index 2e624cd17e..1ea4911172 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -112,7 +112,7 @@ Foam::ReactingCloud<ParcelType>::Srho() const
     );
 
     scalarField& sourceField = trhoTrans().field();
-    forAll (rhoTrans_, i)
+    forAll(rhoTrans_, i)
     {
         sourceField += rhoTrans_[i];
     }
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 0ff34c56c4..a0484aa90d 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -78,7 +78,7 @@ void Foam::phaseProperties::setGlobalCarrierIds
 
     forAll(names_, i)
     {
-        forAll (carrierNames, j)
+        forAll(carrierNames, j)
         {
             if (carrierNames[j] == names_[i])
             {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index ad71a5ea29..66949537ca 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -143,7 +143,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~FieldActivatedInjection();
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
index fdf6ff0e4f..8c78868648 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C
@@ -39,6 +39,7 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel(CloudType& owner)
     owner_(owner),
     g_(dimensionedVector("zero", dimAcceleration, vector::zero)),
     coeffDict_(dictionary::null),
+    active_(false),
     injectorCellsPatch_(0),
     massParcelPatch_(0),
     diameterParcelPatch_(0),
@@ -62,6 +63,7 @@ Foam::SurfaceFilmModel<CloudType>::SurfaceFilmModel
     owner_(owner),
     g_(g),
     coeffDict_(dict.subDict(type + "Coeffs")),
+    active_(true),
     injectorCellsPatch_(0),
     massParcelPatch_(0),
     diameterParcelPatch_(0),
@@ -85,6 +87,11 @@ template<class CloudType>
 template<class TrackData>
 void Foam::SurfaceFilmModel<CloudType>::inject(TrackData& td)
 {
+    if (!active_)
+    {
+        return;
+    }
+
     // Retrieve the film model from the owner database
     const surfaceFilmModels::surfaceFilmModel& filmModel =
         this->owner().db().objectRegistry::lookupObject
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
index 145b1f421f..41d01f0eee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H
@@ -79,6 +79,9 @@ protected:
         //- The coefficients dictionary
         const dictionary coeffDict_;
 
+        //- Active flag
+        bool active_;
+
 
         // Cached injector fields per film patch
 
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index 9a6c0c4234..a3ed290d02 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -73,7 +73,7 @@ public:
         cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh);
 
 
-    // Destructor
+    //- Destructor
     virtual ~cloudAbsorptionEmission();
 
 
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index c5d4171fa7..d4f87ee83b 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -77,7 +77,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~cloudScatter();
 
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
index 428f4cd4fb..2725d87b93 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -106,9 +106,8 @@ public:
         bufferedAccumulator(const bufferedAccumulator<Type>&);
 
 
-    // Destructor
-
-        ~bufferedAccumulator();
+    //- Destructor
+    ~bufferedAccumulator();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
index ad287fa522..9bf6d1442c 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -120,9 +120,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~correlationFunction();
+    //- Destructor
+    ~correlationFunction();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
index e7380f9dff..42a34782c6 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -340,7 +340,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
 
         scalar checkNormalisation = 0;
 
-        forAll (oldDist, oD)
+        forAll(oldDist, oD)
         {
             checkNormalisation += oldDist[oD].second()*binWidth_;
         }
@@ -404,7 +404,7 @@ Foam::List<Foam::Pair<Foam::scalar> > Foam::distribution::normalisedShifted
     {
         scalar checkNormalisation = 0;
 
-        forAll (newDist, nD)
+        forAll(newDist, nD)
         {
             checkNormalisation += newDist[nD].second()*binWidth_;
         }
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
index 0b0570c6a8..e06962a661 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
@@ -87,9 +87,8 @@ public:
         distribution(const distribution&);
 
 
-    // Destructor
-
-        virtual ~distribution();
+    //- Destructor
+    virtual ~distribution();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
index f4b0c60ed0..56d1e2046d 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
@@ -45,7 +45,7 @@ void Foam::directInteractionList::buildDirectInteractionList
 
         label pointJIndex;
 
-        forAll (mesh.points(), pointIIndex)
+        forAll(mesh.points(), pointIIndex)
         {
             for
             (
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
index 4a984f4738..4583b84429 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
@@ -91,9 +91,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~directInteractionList();
+    //- Destructor
+    ~directInteractionList();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
index bd69fbacbc..a0ff1b2645 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
@@ -271,7 +271,7 @@ bool Foam::interactionLists::testPointFaceDistance
 {
     const vector& pointPosition(mesh_.points()[p]);
 
-    forAll (refCell.faces(), rCF)
+    forAll(refCell.faces(), rCF)
     {
         if
         (
@@ -524,7 +524,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
     {
         const label f = segmentFaces[sF];
 
-        forAll (mesh_.points(), p)
+        forAll(mesh_.points(), p)
         {
             if (testPointFaceDistance(p, f))
             {
@@ -577,7 +577,7 @@ const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
     {
         const edge& eJ(mesh_.edges()[segmentEdges[sE]]);
 
-        forAll (mesh_.edges(), edgeIIndex)
+        forAll(mesh_.edges(), edgeIIndex)
         {
             const edge& eI(mesh_.edges()[edgeIIndex]);
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
index 519934fef1..86caab7317 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
@@ -106,9 +106,8 @@ public:
         interactionLists(const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~interactionLists();
+    //- Destructor
+    ~interactionLists();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
index 020eb637ae..602ab7b497 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
@@ -106,13 +106,13 @@ bool operator==
 
     Foam::List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         Foam::labelList curLList = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLList)
             {
@@ -131,7 +131,7 @@ bool operator==
     // check if all LLists on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
index 092df7a4ba..048cb5c2e6 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
@@ -74,9 +74,8 @@ public:
         receivingReferralList(const receivingReferralList&);
 
 
-    // Destructor
-
-        ~receivingReferralList();
+    //- Destructor
+    ~receivingReferralList();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
index e73f9a6e3a..b25901edc9 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
@@ -104,13 +104,13 @@ bool operator==
 
     Foam::List<bool> fnd(a.size(), false);
 
-    forAll (b, bI)
+    forAll(b, bI)
     {
         Foam::label curLabel = b[bI];
 
         bool found = false;
 
-        forAll (a, aI)
+        forAll(a, aI)
         {
             if (a[aI] == curLabel)
             {
@@ -129,7 +129,7 @@ bool operator==
     // check if all labels on a were marked
     bool result = true;
 
-    forAll (fnd, aI)
+    forAll(fnd, aI)
     {
         result = (result && fnd[aI]);
     }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
index 98d13b6dda..09beca12cd 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
@@ -74,9 +74,8 @@ public:
         sendingReferralList(const sendingReferralList&);
 
 
-    // Destructor
-
-        ~sendingReferralList();
+    //- Destructor
+    ~sendingReferralList();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
index 4fd5262a8c..9c3b2004ca 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
@@ -162,9 +162,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~referredCell();
+    //- Destructor
+    virtual ~referredCell();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
index cc6f8b7d26..b0d951113b 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -166,7 +166,7 @@ void Foam::referredCellList::buildReferredCellList
 
             procPatchSegMap.setSize(patch.size());
 
-            forAll (patch, pI)
+            forAll(patch, pI)
             {
                 label decomposedMeshFace = patch.start() + pI;
 
@@ -298,7 +298,7 @@ void Foam::referredCellList::buildReferredCellList
 
                 DynamicList<tensor> refTrans;
 
-                forAll (patch, faceI)
+                forAll(patch, faceI)
                 {
                     if (processorPatchSegmentMapping[pP][faceI] == nUP)
                     {
@@ -363,7 +363,7 @@ void Foam::referredCellList::buildReferredCellList
     {
         label refIntListStartSize = referredInteractionList.size();
 
-        forAll (mesh.boundaryMesh(), patchI)
+        forAll(mesh.boundaryMesh(), patchI)
         {
             // Treat local cyclics on each processor before processor
             // boundaries.  Separate treatment allows the serial version to run
@@ -473,7 +473,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -492,7 +492,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -703,7 +703,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -724,7 +724,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -948,7 +948,7 @@ void Foam::referredCellList::buildReferredCellList
 
                     DynamicList<label> meshFacesOnThisSegment;
 
-                    forAll (patch, faceI)
+                    forAll(patch, faceI)
                     {
                         if (processorPatchSegmentMapping[pP][faceI] == nUP)
                         {
@@ -976,7 +976,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const labelList& faceEdges = mesh.faceEdges()[segFace];
 
-                        forAll (faceEdges, fE)
+                        forAll(faceEdges, fE)
                         {
                             const label faceEdge(faceEdges[fE]);
 
@@ -997,7 +997,7 @@ void Foam::referredCellList::buildReferredCellList
 
                         const face& facePoints(mesh.faces()[segFace]);
 
-                        forAll (facePoints, fP)
+                        forAll(facePoints, fP)
                         {
                             const label facePoint(facePoints[fP]);
 
@@ -1398,7 +1398,7 @@ void Foam::referredCellList::buildReferredCellList
 
 //         scalar rCutMaxSqr = molCloud_.rCutMax()*molCloud_.rCutMax();
 //
-//         forAll (molCloud_.mesh().points(), pointIIndex)
+//         forAll(molCloud_.mesh().points(), pointIIndex)
 //         {
 //             const point& ptI
 //             (
@@ -1485,7 +1485,7 @@ void Foam::referredCellList::referMolecules
         {
             List<molecule*> realMols = cellOccupancy[sRL[sRLI]];
 
-            forAll (realMols, rM)
+            forAll(realMols, rM)
             {
                 molecule* mol = realMols[rM];
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
index 9eca88877a..c3c099097c 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
@@ -82,9 +82,8 @@ public:
         referredCellList (interactionLists& il);
 
 
-    // Destructor
-
-        ~referredCellList();
+    //- Destructor
+    ~referredCellList();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
index 59d25a0a2d..b318cec394 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
@@ -74,9 +74,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~referredMolecule();
+    //- Destructor
+    virtual ~referredMolecule();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index 4e93070479..5a195aa938 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -6,7 +6,7 @@ if (runTime.outputTime())
 
     scalarField totalRhoN_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesRhoN, rN)
+    forAll(allSpeciesRhoN, rN)
     {
         allSpeciesRhoN[rN].internalField() =
             allSpeciesN_RU[rN]
@@ -25,7 +25,7 @@ if (runTime.outputTime())
 
     scalarField totalRhoM_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesRhoM, rM)
+    forAll(allSpeciesRhoM, rM)
     {
         allSpeciesRhoM[rM].internalField() =
             allSpeciesM_RU[rM]
@@ -45,7 +45,7 @@ if (runTime.outputTime())
 
     scalarField totalMass_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesVelocity, v)
+    forAll(allSpeciesVelocity, v)
     {
         // A check for 1/0 molecules is required.
 
@@ -99,7 +99,7 @@ if (runTime.outputTime())
 
     scalarField totalN_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesTemperature, t)
+    forAll(allSpeciesTemperature, t)
     {
         // A check for 1/0 molecules is required.
 
@@ -170,7 +170,7 @@ if (runTime.outputTime())
 
     scalarField totalKE_sum(mesh.nCells(), 0.0);
 
-    forAll (allSpeciesMeanKE, mKE)
+    forAll(allSpeciesMeanKE, mKE)
     {
         // A check for 1/0 molecules is required.
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index f604b8f3b8..9a7be0be73 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -25,20 +25,13 @@ License
 
 if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     Field<vector> uVals(molecules.size());
 
     label uV = 0;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol, uV++
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
-        uVals[uV] = mol().U();
+        uVals[uV++] = mol().U();
     }
 
     vacf.calculateCorrelationFunction(uVals);
@@ -46,16 +39,9 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     vector p = vector::zero;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
         p.x() +=
             mol().mass() * mol().U().y() * mol().U().z()
@@ -75,17 +61,9 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
 
 if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
 {
-
-    IDLList<molecule>::iterator mol(molecules.begin());
-
     vector s = vector::zero;
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
         s +=
         (
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index 50e82df48a..6d6617d652 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -37,7 +37,7 @@ PtrList<volScalarField> allSpeciesRhoN
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesRhoN, rN)
+forAll(allSpeciesRhoN, rN)
 {
     Info<< "    Creating number density field for "
         << molecules.potential().idList()[rN] << endl;
@@ -92,7 +92,7 @@ PtrList<volScalarField> allSpeciesRhoM
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesRhoM, rM)
+forAll(allSpeciesRhoM, rM)
 {
     Info<< "    Creating mass density field for "
         << molecules.potential().idList()[rM] << endl;
@@ -147,7 +147,7 @@ PtrList<volVectorField> allSpeciesVelocity
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesVelocity, v)
+forAll(allSpeciesVelocity, v)
 {
     Info<< "    Creating velocity field for "
         << molecules.potential().idList()[v] << endl;
@@ -221,7 +221,7 @@ PtrList<volScalarField> allSpeciesTemperature
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesTemperature, t)
+forAll(allSpeciesTemperature, t)
 {
     Info<< "    Creating temperature field for "
         << molecules.potential().idList()[t] << endl;
@@ -277,7 +277,7 @@ PtrList<volScalarField> allSpeciesMeanKE
     molecules.potential().nIds()
 );
 
-forAll (allSpeciesMeanKE, mKE)
+forAll(allSpeciesMeanKE, mKE)
 {
     Info<< "    Creating mean kinetic energy field for "
         << molecules.potential().idList()[mKE] << endl;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 193dbcc723..05569f0448 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -54,16 +54,9 @@ label singleStepNMols = molecules.size();
 label singleStepDOFs = 0;
 
 {
-    IDLList<molecule>::iterator mol(molecules.begin());
-
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
-        label molId = mol().id();
+        const label molId = mol().id();
 
         scalar molMass(molecules.constProps(molId).mass());
 
@@ -77,14 +70,9 @@ label singleStepDOFs = 0;
     //     singleStepCentreOfMass /= singleStepTotalMass;
     // }
 
-    for
-    (
-        mol = molecules.begin();
-        mol != molecules.end();
-        ++mol
-    )
+    forAllConstIter(IDLList<molecule>, molecules, mol)
     {
-        label molId = mol().id();
+        const label molId = mol().id();
 
         const molecule::constantProperties cP(molecules.constProps(molId));
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 71cdac097d..b6d93b721d 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -348,7 +348,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
             }
         }
 
-        forAll (molsToDelete, mTD)
+        forAll(molsToDelete, mTD)
         {
             deleteParticle(*(molsToDelete[mTD]));
         }
@@ -438,7 +438,7 @@ void Foam::moleculeCloud::removeHighEnergyOverlaps()
             }
         }
 
-        forAll (molsToDelete, mTD)
+        forAll(molsToDelete, mTD)
         {
             deleteParticle(*(molsToDelete[mTD]));
         }
@@ -475,7 +475,7 @@ void Foam::moleculeCloud::initialiseMolecules
             << abort(FatalError);
     }
 
-    forAll (cellZones, z)
+    forAll(cellZones, z)
     {
         const cellZone& zone(cellZones[z]);
 
@@ -632,7 +632,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 vector zoneMax = -VGREAT*vector::one;
 
-                forAll (zone, cell)
+                forAll(zone, cell)
                 {
                     const point cellCentre = mesh_.cellCentres()[zone[cell]];
 
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index 19e172d91d..698ef30701 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -120,9 +120,8 @@ public:
         reducedUnits(const IOdictionary& reducedUnitsDict);
 
 
-    // Destructor
-
-        ~reducedUnits();
+    //- Destructor
+    ~reducedUnits();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
index 00107a7597..653d229b9b 100644
--- a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
@@ -61,10 +61,9 @@ public:
         electrostaticPotential();
 
 
-    // Destructor
-
-        ~electrostaticPotential()
-        {}
+    //- Destructor
+    ~electrostaticPotential()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index 64165c9cbb..227548b6ef 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -117,10 +117,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~energyScalingFunction()
-        {}
+    //- Destructor
+    virtual ~energyScalingFunction()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
index 82dc72652e..11ccd2884d 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
@@ -89,10 +89,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~doubleSigmoid()
-        {}
+    //- Destructor
+    ~doubleSigmoid()
+    {}
 
     // Member Functions
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
index 96caa99066..67f8131957 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
@@ -70,10 +70,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~noScaling()
-        {}
+    //- Destructor
+    ~noScaling()
+    {}
 
     // Member Functions
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
index f00d0aee58..14ed2f8d74 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
@@ -74,10 +74,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~shifted()
-        {}
+    //- Destructor
+    ~shifted()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
index cb22fbe41f..0fa720703b 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
@@ -78,10 +78,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~shiftedForce()
-        {}
+    //- Destructor
+    ~shiftedForce()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
index d8b385df5f..ee2e9059c0 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
@@ -87,10 +87,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~sigmoid()
-        {}
+    //- Destructor
+    ~sigmoid()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index 56766caab9..a7e8198a13 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -131,10 +131,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pairPotential()
-        {}
+    //- Destructor
+    virtual ~pairPotential()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
index b9331c3903..29dce7f4c4 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
@@ -101,10 +101,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~azizChen()
-        {}
+    //- Destructor
+    ~azizChen()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
index 4f61d3845c..2db8d3bde3 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
@@ -72,10 +72,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~coulomb()
-        {}
+    //- Destructor
+    ~coulomb()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
index 64a4addef7..7a0497a69e 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
@@ -80,10 +80,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~dampedCoulomb()
-        {}
+    //- Destructor
+    ~dampedCoulomb()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
index cc0eeeaf84..170d671221 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
@@ -76,10 +76,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~exponentialRepulsion()
-        {}
+    //- Destructor
+    ~exponentialRepulsion()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
index b03b4ecfbe..2b5a16c49b 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
@@ -76,10 +76,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~lennardJones()
-        {}
+    //- Destructor
+    ~lennardJones()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
index 79f937b4d0..bd76b8259b 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
@@ -104,10 +104,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~maitlandSmith()
-        {}
+    //- Destructor
+    ~maitlandSmith()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
index ebd51312fb..44a5ab87cc 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
@@ -69,10 +69,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~noInteraction()
-        {}
+    //- Destructor
+    ~noInteraction()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index 191a92b1b2..8aed64aa5c 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~pairPotentialList();
+    //- Destructor
+    ~pairPotentialList();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
index ce9a661f8b..8ea0043784 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.H
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~potential();
+    //- Destructor
+    ~potential();
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index c2bc17220b..26d03fcf22 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -111,10 +111,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~tetherPotential()
-        {}
+    //- Destructor
+    virtual ~tetherPotential()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
index 361547058f..c6f5eabca0 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
@@ -75,10 +75,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~harmonicSpring()
-        {}
+    //- Destructor
+    ~harmonicSpring()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
index cb854044db..297516301b 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
@@ -77,10 +77,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~pitchForkRing()
-        {}
+    //- Destructor
+    ~pitchForkRing()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
index 0a4c7375ac..258e04a6be 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
@@ -77,10 +77,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~restrainedHarmonicSpring()
-        {}
+    //- Destructor
+    ~restrainedHarmonicSpring()
+    {}
 
 
     // Member Functions
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index a5899e57cd..1787092bf1 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -93,9 +93,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~tetherPotentialList();
+    //- Destructor
+    ~tetherPotentialList();
 
 
     // Member Functions
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index 5eedc280b0..201a7020ea 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -72,7 +72,7 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
     c.checkFieldIOobject(c, U);
 
     label i = 0;
-    forAllIter(Cloud<solidParticle>::iterator, c, iter)
+    forAllIter(Cloud<solidParticle>, c, iter)
     {
         solidParticle& p = iter();
 
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index 6eb0d60a3f..a73b502a9c 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -125,12 +125,7 @@ void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
@@ -165,12 +160,7 @@ void meshRefinement::reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
         mesh.objectRegistry::lookupClass<GeoField>()
     );
 
-    for
-    (
-        typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
-        iter != flds.end();
-        ++iter
-    )
+    forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
     {
         const GeoField& fld = *iter();
 
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
index 24ca20da1a..83f3a71533 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/ExactParticle.H
@@ -123,10 +123,9 @@ public:
         };
 
 
-    // Destructor
-
-        virtual ~ExactParticle()
-        {}
+    //- Destructor
+    virtual ~ExactParticle()
+    {}
 
 
     // Member Functions
diff --git a/src/mesh/blockMesh/block/block.H b/src/mesh/blockMesh/block/block.H
index bdd555fb19..dcac3e9501 100644
--- a/src/mesh/blockMesh/block/block.H
+++ b/src/mesh/blockMesh/block/block.H
@@ -121,8 +121,7 @@ public:
 
 
     //- Destructor
-
-        ~block();
+    ~block();
 
 
     // Member Functions
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
index bcf3a1cf36..799383de3a 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.H
@@ -133,9 +133,8 @@ public:
         }
 
 
-    // Destructor
-
-        ~blockDescriptor();
+    //- Destructor
+    ~blockDescriptor();
 
 
     // Member Functions
diff --git a/src/mesh/blockMesh/blockMesh/blockMesh.H b/src/mesh/blockMesh/blockMesh/blockMesh.H
index ab0ac66aae..4d1b1deb0a 100644
--- a/src/mesh/blockMesh/blockMesh/blockMesh.H
+++ b/src/mesh/blockMesh/blockMesh/blockMesh.H
@@ -133,9 +133,8 @@ public:
         blockMesh(IOdictionary&);
 
 
-    // Destructor
-
-        ~blockMesh();
+    //- Destructor
+    ~blockMesh();
 
 
     // Member Functions
diff --git a/src/mesh/blockMesh/curvedEdges/arcEdge.H b/src/mesh/blockMesh/curvedEdges/arcEdge.H
index 51dcdf27e5..567431f510 100644
--- a/src/mesh/blockMesh/curvedEdges/arcEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/arcEdge.H
@@ -89,9 +89,8 @@ public:
         arcEdge(const pointField& points, Istream&);
 
 
-    // Destructor
-
-        virtual ~arcEdge(){}
+    //- Destructor
+    virtual ~arcEdge(){}
 
 
     // Member Functions
diff --git a/src/mesh/blockMesh/curvedEdges/curvedEdge.H b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
index 2007f3509b..c7cf157e89 100644
--- a/src/mesh/blockMesh/curvedEdges/curvedEdge.H
+++ b/src/mesh/blockMesh/curvedEdges/curvedEdge.H
@@ -117,9 +117,8 @@ public:
         static autoPtr<curvedEdge> New(const pointField&, Istream&);
 
 
-    // Destructor
-
-        virtual ~curvedEdge(){}
+    //- Destructor
+    virtual ~curvedEdge(){}
 
 
     // Member Functions
diff --git a/src/meshTools/PointEdgeWave/PointEdgeWave.H b/src/meshTools/PointEdgeWave/PointEdgeWave.H
index 326eeaad5e..a40edb3b83 100644
--- a/src/meshTools/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/PointEdgeWave/PointEdgeWave.H
@@ -279,9 +279,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~PointEdgeWave();
+    //- Destructor
+    ~PointEdgeWave();
 
 
     // Member Functions
diff --git a/src/meshTools/cellClassification/cellClassification.C b/src/meshTools/cellClassification/cellClassification.C
index a2a1594878..dbc8bf29fb 100644
--- a/src/meshTools/cellClassification/cellClassification.C
+++ b/src/meshTools/cellClassification/cellClassification.C
@@ -36,10 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(cellClassification, 0);
-}
+defineTypeNameAndDebug(Foam::cellClassification, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -829,15 +826,10 @@ Foam::label Foam::cellClassification::fillRegionPoints
 
         label nChanged = 0;
 
-        for
-        (
-            labelHashSet::const_iterator iter = nonManifoldPoints.begin();
-            iter != nonManifoldPoints.end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, nonManifoldPoints, iter)
         {
             // Find a face on fp using point and remove it.
-            label patchPointI = meshPointMap[iter.key()];
+            const label patchPointI = meshPointMap[iter.key()];
 
             const labelList& pFaces = fp.pointFaces()[patchPointI];
 
@@ -846,16 +838,14 @@ Foam::label Foam::cellClassification::fillRegionPoints
             // one would be best to remove.
             forAll(pFaces, i)
             {
-                label patchFaceI = pFaces[i];
-
-                label ownerCell = outsideOwner[patchFaceI];
+                const label patchFaceI = pFaces[i];
+                const label ownerCell  = outsideOwner[patchFaceI];
 
                 if (operator[](ownerCell) == meshType)
                 {
                     operator[](ownerCell) = fillType;
 
                     nChanged++;
-
                     break;
                 }
             }
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index 5aec213dd0..548198b3b8 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -133,9 +133,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~patchDataWave();
+    //- Destructor
+    virtual ~patchDataWave();
 
 
     // Member Functions
diff --git a/src/meshTools/cellDist/patchWave/patchWave.H b/src/meshTools/cellDist/patchWave/patchWave.H
index 67e440c427..371e7a2c12 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.H
+++ b/src/meshTools/cellDist/patchWave/patchWave.H
@@ -109,9 +109,8 @@ public:
             bool correctWalls = true
         );
 
-    // Destructor
-
-        virtual ~patchWave();
+    //- Destructor
+    virtual ~patchWave();
 
 
     // Member Functions
diff --git a/src/meshTools/cellFeatures/cellFeatures.H b/src/meshTools/cellFeatures/cellFeatures.H
index 7c0c235e96..84c8580a56 100644
--- a/src/meshTools/cellFeatures/cellFeatures.H
+++ b/src/meshTools/cellFeatures/cellFeatures.H
@@ -124,9 +124,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~cellFeatures();
+    //- Destructor
+    ~cellFeatures();
 
 
     // Member Functions
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index 6a6ec54180..99afc59181 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -57,7 +57,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         vector s = areas[faceI];
@@ -71,7 +71,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
         result[nei[faceI]] = max(cosDDotS, result[nei[faceI]]);
     }
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -119,7 +119,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         scalar dOwn = mag
         (
@@ -144,7 +144,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
         result[nei[faceI]] = max(skewness, result[nei[faceI]]);
     }
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -196,7 +196,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         vector d = centres[nei[faceI]] - centres[own[faceI]];
         vector s = areas[faceI];
@@ -210,7 +210,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
 
     label globalFaceI = mesh_.nInternalFaces();
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
@@ -257,7 +257,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
     const labelList& own = mesh_.faceOwner();
     const labelList& nei = mesh_.faceNeighbour();
 
-    forAll (nei, faceI)
+    forAll(nei, faceI)
     {
         scalar dOwn = mag
         (
@@ -281,7 +281,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
 
     label globalFaceI = mesh_.nInternalFaces();
 
-    forAll (mesh_.boundaryMesh(), patchI)
+    forAll(mesh_.boundaryMesh(), patchI)
     {
         const unallocLabelList& faceCells =
             mesh_.boundaryMesh()[patchI].faceCells();
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
index 9f1a105255..9f47749882 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H
@@ -158,10 +158,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~coordinateRotation()
-        {}
+    //- Destructor
+    virtual ~coordinateRotation()
+    {}
 
 
     // Member Functions
diff --git a/src/meshTools/meshSearch/meshSearch.C b/src/meshTools/meshSearch/meshSearch.C
index 6bfeadbd62..4ae5ffc616 100644
--- a/src/meshTools/meshSearch/meshSearch.C
+++ b/src/meshTools/meshSearch/meshSearch.C
@@ -360,7 +360,7 @@ Foam::label Foam::meshSearch::findNearestBoundaryFaceWalk
 
         const labelList& myEdges = mesh_.faceEdges()[curFaceI];
 
-        forAll (myEdges, myEdgeI)
+        forAll(myEdges, myEdgeI)
         {
             const labelList& neighbours = mesh_.edgeFaces()[myEdges[myEdgeI]];
 
diff --git a/src/meshTools/meshSearch/meshSearch.H b/src/meshTools/meshSearch/meshSearch.H
index 15ead1d53b..dfaf71229b 100644
--- a/src/meshTools/meshSearch/meshSearch.H
+++ b/src/meshTools/meshSearch/meshSearch.H
@@ -168,9 +168,8 @@ public:
         meshSearch(const polyMesh& mesh, const bool faceDecomp = true);
 
 
-    // Destructor
-
-        ~meshSearch();
+    //- Destructor
+    ~meshSearch();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/octree.H b/src/meshTools/octree/octree.H
index 68262d19b4..5bf0a9a69c 100644
--- a/src/meshTools/octree/octree.H
+++ b/src/meshTools/octree/octree.H
@@ -212,9 +212,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~octree();
+    //- Destructor
+    ~octree();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/octreeDataEdges.H b/src/meshTools/octree/octreeDataEdges.H
index e262f611f9..07f3acea04 100644
--- a/src/meshTools/octree/octreeDataEdges.H
+++ b/src/meshTools/octree/octreeDataEdges.H
@@ -95,9 +95,8 @@ public:
         octreeDataEdges(const octreeDataEdges&);
 
 
-    // Destructor
-
-        ~octreeDataEdges();
+    //- Destructor
+    ~octreeDataEdges();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/octreeDataFace.C b/src/meshTools/octree/octreeDataFace.C
index 7cc8e87905..23d0664ff7 100644
--- a/src/meshTools/octree/octreeDataFace.C
+++ b/src/meshTools/octree/octreeDataFace.C
@@ -45,7 +45,7 @@ void Foam::octreeDataFace::calcBb()
     allBb_.setSize(meshFaces_.size());
     allBb_ = treeBoundBox::invertedBox;
 
-    forAll (meshFaces_, i)
+    forAll(meshFaces_, i)
     {
         // Update bb of face
         treeBoundBox& myBb = allBb_[i];
diff --git a/src/meshTools/octree/octreeDataFace.H b/src/meshTools/octree/octreeDataFace.H
index 79f97e8737..8f041c7349 100644
--- a/src/meshTools/octree/octreeDataFace.H
+++ b/src/meshTools/octree/octreeDataFace.H
@@ -130,9 +130,8 @@ public:
         octreeDataFace(const octreeDataFace&);
 
 
-    // Destructor
-
-        ~octreeDataFace();
+    //- Destructor
+    ~octreeDataFace();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/octreeLine.H b/src/meshTools/octree/octreeLine.H
index b75198944b..99473aeac4 100644
--- a/src/meshTools/octree/octreeLine.H
+++ b/src/meshTools/octree/octreeLine.H
@@ -123,9 +123,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~octreeLine();
+    //- Destructor
+    ~octreeLine();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/treeLeaf.H b/src/meshTools/octree/treeLeaf.H
index f0de8ec75a..f5f3eb7cd1 100644
--- a/src/meshTools/octree/treeLeaf.H
+++ b/src/meshTools/octree/treeLeaf.H
@@ -113,9 +113,8 @@ public:
         treeLeaf(Istream&);
 
 
-    // Destructor
-
-        ~treeLeaf();
+    //- Destructor
+    ~treeLeaf();
 
 
     // Member Functions
diff --git a/src/meshTools/octree/treeNode.H b/src/meshTools/octree/treeNode.H
index 12c33f1858..af888118e2 100644
--- a/src/meshTools/octree/treeNode.H
+++ b/src/meshTools/octree/treeNode.H
@@ -159,9 +159,8 @@ public:
         treeNode(Istream&);
 
 
-    // Destructor
-
-        ~treeNode();
+    //- Destructor
+    ~treeNode();
 
 
     // Member Functions
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index 5c45ea1a01..029d85d6a4 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -76,7 +76,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         const faceList& oldFaces = mesh.faces();
         const labelListList& pFaces = mesh.pointFaces();
 
-        forAll (Cells, cellI)
+        forAll(Cells, cellI)
         {
             const labelList& curFaces = Cells[cellI];
             const edgeList cellEdges = Cells[cellI].edges(oldFaces);
@@ -86,15 +86,15 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             labelList edgeUsage(cellEdges.size(), 0);
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 edgeList curFaceEdges = oldFaces[curFaces[faceI]].edges();
 
-                forAll (curFaceEdges, faceEdgeI)
+                forAll(curFaceEdges, faceEdgeI)
                 {
                     const edge& curEdge = curFaceEdges[faceEdgeI];
 
-                    forAll (cellEdges, cellEdgeI)
+                    forAll(cellEdges, cellEdgeI)
                     {
                         if (cellEdges[cellEdgeI] == curEdge)
                         {
@@ -108,7 +108,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             edgeList singleEdges(cellEdges.size());
             label nSingleEdges = 0;
 
-            forAll (edgeUsage, edgeI)
+            forAll(edgeUsage, edgeI)
             {
                 if (edgeUsage[edgeI] == 1)
                 {
@@ -124,7 +124,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         << "in mesh structure. " << endl;
 
 #                   ifdef DEBUG_ZIPUP
-                    forAll (curFaces, faceI)
+                    forAll(curFaces, faceI)
                     {
                         Info<< "face: " << oldFaces[curFaces[faceI]]
                             << endl;
@@ -134,7 +134,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                         << "Edge usage: " << edgeUsage << nl
                         << "Cell points: " << cellPoints << endl;
 
-                    forAll (cellPoints, cpI)
+                    forAll(cellPoints, cpI)
                     {
                         Info<< "vertex create \"" << cellPoints[cpI]
                             << "\" coordinates "
@@ -155,7 +155,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #           ifdef DEBUG_ZIPUP
             Info<< "Cell " << cellI << endl;
 
-            forAll (curFaces, faceI)
+            forAll(curFaces, faceI)
             {
                 Info<< "face: " << oldFaces[curFaces[faceI]] << endl;
             }
@@ -165,7 +165,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 << "Single edges: " << singleEdges << nl
                 << "Cell points: " << cellPoints << endl;
 
-            forAll (cellPoints, cpI)
+            forAll(cellPoints, cpI)
             {
                 Info<< "vertex create \"" << cellPoints[cpI]
                     << "\" coordinates "
@@ -179,11 +179,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             labelList pointUsage(cellPoints.size(), 0);
 
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 const edge& curEdge = singleEdges[edgeI];
 
-                forAll (cellPoints, pointI)
+                forAll(cellPoints, pointI)
                 {
                     if
                     (
@@ -200,7 +200,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
             // loop through all edges and eliminate the ones that are
             // blocked out
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 bool blockedHead = false;
                 bool blockedTail = false;
@@ -209,7 +209,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 label newEdgeEnd = singleEdges[edgeI].end();
 
                 // check that the edge has not got all ends blocked
-                forAll (cellPoints, pointI)
+                forAll(cellPoints, pointI)
                 {
                     if (cellPoints[pointI] == newEdgeStart)
                     {
@@ -242,7 +242,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             label nEdgesToInsert = 0;
 
             // Find a good edge
-            forAll (singleEdges, edgeI)
+            forAll(singleEdges, edgeI)
             {
                 SLList<label> pointChain;
 
@@ -266,7 +266,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #                   endif
 
                     // Check if head or tail are blocked
-                    forAll (cellPoints, pointI)
+                    forAll(cellPoints, pointI)
                     {
                         if (cellPoints[pointI] == newEdgeStart)
                         {
@@ -299,7 +299,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     {
                         stopSearching = false;
 
-                        forAll (singleEdges, addEdgeI)
+                        forAll(singleEdges, addEdgeI)
                         {
                             if (!singleEdgeUsage[addEdgeI])
                             {
@@ -361,7 +361,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                                     << " curEdgeEnd: " << curEdgeEnd << endl;
 #                               endif
 
-                                forAll (cellPoints, pointI)
+                                forAll(cellPoints, pointI)
                                 {
                                     if (cellPoints[pointI] == curEdgeStart)
                                     {
@@ -431,7 +431,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #           endif
 
             // Insert the edges into a list of faces
-            forAll (edgesToInsert, edgeToInsertI)
+            forAll(edgesToInsert, edgeToInsertI)
             {
                 // Order the points of the edge
                 // Warning: the ordering must be parametric, because in
@@ -460,12 +460,12 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 labelList orderedEdge(unorderedEdge.size(), -1);
                 boolList used(unorderedEdge.size(), false);
 
-                forAll (orderedEdge, epI)
+                forAll(orderedEdge, epI)
                 {
                     label nextPoint = -1;
                     scalar minDist = GREAT;
 
-                    forAll (dist, i)
+                    forAll(dist, i)
                     {
                         if (!used[i] && dist[i] < minDist)
                         {
@@ -485,7 +485,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #               endif
 
                 // check for duplicate points in the ordered edge
-                forAll (orderedEdge, checkI)
+                forAll(orderedEdge, checkI)
                 {
                     for
                     (
@@ -520,16 +520,16 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                 labelList facesSharingEdge(startPF.size() + endPF.size());
                 label nfse = 0;
 
-                forAll (startPF, pfI)
+                forAll(startPF, pfI)
                 {
                     facesSharingEdge[nfse++] = startPF[pfI];
                 }
-                forAll (endPF, pfI)
+                forAll(endPF, pfI)
                 {
                     facesSharingEdge[nfse++] = endPF[pfI];
                 }
 
-                forAll (facesSharingEdge, faceI)
+                forAll(facesSharingEdge, faceI)
                 {
                     bool faceChanges = false;
 
@@ -539,7 +539,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
                     const edgeList curFaceEdges =
                         oldFaces[currentFaceIndex].edges();
 
-                    forAll (curFaceEdges, cfeI)
+                    forAll(curFaceEdges, cfeI)
                     {
                         if (curFaceEdges[cfeI] == testEdge)
                         {
@@ -567,11 +567,11 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
                         bool allPointsPresent = true;
 
-                        forAll (orderedEdge, oeI)
+                        forAll(orderedEdge, oeI)
                         {
                             bool curPointFound = false;
 
-                            forAll (newFace, nfI)
+                            forAll(newFace, nfI)
                             {
                                 if (newFace[nfI] == orderedEdge[oeI])
                                 {
@@ -611,7 +611,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 
                             bool edgeAdded = false;
 
-                            forAll (newFaceEdges, curFacEdgI)
+                            forAll(newFaceEdges, curFacEdgI)
                             {
                                 // Does the current edge change?
                                 if (newFaceEdges[curFacEdgI] == testEdge)
@@ -679,7 +679,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
 #                           endif
 
                             // Check for duplicate points in the new face
-                            forAll (newFace, checkI)
+                            forAll(newFace, checkI)
                             {
                                 for
                                 (
@@ -745,7 +745,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
         labelList patchSizes(bMesh.size(), 0);
         labelList patchStarts(bMesh.size(), 0);
 
-        forAll (bMesh, patchI)
+        forAll(bMesh, patchI)
         {
             patchSizes[patchI] = bMesh[patchI].size();
             patchStarts[patchI] = bMesh[patchI].start();
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
index d00d42c8da..70bfa897a9 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
@@ -859,7 +859,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
 
     // Do decomposition according to triangle centre
     pointField triCentres(s.size());
-    forAll (s, triI)
+    forAll(s, triI)
     {
         triCentres[triI] = s[triI].centre(s.points());
     }
@@ -879,7 +879,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         bbs[procI][0].max() = point(-VGREAT, -VGREAT, -VGREAT);
     }
 
-    forAll (s, triI)
+    forAll(s, triI)
     {
         point& bbMin = bbs[distribution[triI]][0].min();
         point& bbMax = bbs[distribution[triI]][0].max();
diff --git a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
index bc3555d061..e061389f13 100644
--- a/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/distributedTriSurfaceMesh.H
@@ -324,9 +324,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~distributedTriSurfaceMesh();
+    //- Destructor
+    virtual ~distributedTriSurfaceMesh();
 
         //- Clear storage
         void clearOut();
diff --git a/src/meshTools/searchableSurface/searchableBox.H b/src/meshTools/searchableSurface/searchableBox.H
index b79b0dd98f..c4afd2bb4e 100644
--- a/src/meshTools/searchableSurface/searchableBox.H
+++ b/src/meshTools/searchableSurface/searchableBox.H
@@ -105,9 +105,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchableBox();
+    //- Destructor
+    virtual ~searchableBox();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchableCylinder.H b/src/meshTools/searchableSurface/searchableCylinder.H
index 0ecc014c34..c08c4a828e 100644
--- a/src/meshTools/searchableSurface/searchableCylinder.H
+++ b/src/meshTools/searchableSurface/searchableCylinder.H
@@ -128,9 +128,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchableCylinder();
+    //- Destructor
+    virtual ~searchableCylinder();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchablePlane.H b/src/meshTools/searchableSurface/searchablePlane.H
index 9260eb690d..686a1bfcfe 100644
--- a/src/meshTools/searchableSurface/searchablePlane.H
+++ b/src/meshTools/searchableSurface/searchablePlane.H
@@ -100,9 +100,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchablePlane();
+    //- Destructor
+    virtual ~searchablePlane();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchablePlate.H b/src/meshTools/searchableSurface/searchablePlate.H
index 36eb3b910a..4b3dd4f737 100644
--- a/src/meshTools/searchableSurface/searchablePlate.H
+++ b/src/meshTools/searchableSurface/searchablePlate.H
@@ -123,9 +123,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchablePlate();
+    //- Destructor
+    virtual ~searchablePlate();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSphere.H b/src/meshTools/searchableSurface/searchableSphere.H
index b97e0916e4..1765d1c698 100644
--- a/src/meshTools/searchableSurface/searchableSphere.H
+++ b/src/meshTools/searchableSurface/searchableSphere.H
@@ -111,9 +111,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchableSphere();
+    //- Destructor
+    virtual ~searchableSphere();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurface.H b/src/meshTools/searchableSurface/searchableSurface.H
index fae9265305..a6ac99a71a 100644
--- a/src/meshTools/searchableSurface/searchableSurface.H
+++ b/src/meshTools/searchableSurface/searchableSurface.H
@@ -166,9 +166,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~searchableSurface();
+    //- Destructor
+    virtual ~searchableSurface();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.H b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
index 01490e409f..ef5419927c 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.H
@@ -130,9 +130,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchableSurfaceCollection();
+    //- Destructor
+    virtual ~searchableSurfaceCollection();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
index 416d60ae44..3ff95dd5f3 100644
--- a/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
+++ b/src/meshTools/searchableSurface/searchableSurfaceWithGaps.H
@@ -120,9 +120,8 @@ public:
             const dictionary& dict
         );
 
-    // Destructor
-
-        virtual ~searchableSurfaceWithGaps();
+    //- Destructor
+    virtual ~searchableSurfaceWithGaps();
 
 
     // Member Functions
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.H b/src/meshTools/searchableSurface/triSurfaceMesh.H
index b0ae9a2c71..db9b139cbe 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.H
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.H
@@ -159,9 +159,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~triSurfaceMesh();
+    //- Destructor
+    virtual ~triSurfaceMesh();
 
         //- Clear storage
         void clearOut();
diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
index 75dc385c4e..38df2e703e 100644
--- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
+++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.H
@@ -96,9 +96,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~boxToCell();
+    //- Destructor
+    virtual ~boxToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
index 6e076370e0..85a0f1af72 100644
--- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
+++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cellToCell();
+    //- Destructor
+    virtual ~cellToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
index 15cee8c3fb..879297cbe6 100644
--- a/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
+++ b/src/meshTools/sets/cellSources/cylinderToCell/cylinderToCell.H
@@ -103,9 +103,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cylinderToCell();
+    //- Destructor
+    virtual ~cylinderToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
index 39b48a838d..a1ab4a2699 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C
@@ -73,18 +73,13 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
 
     // Handle owner/neighbour/any selection
-    for
-    (
-        faceSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, loadedSet, iter)
     {
-        label faceI = iter.key();
+        const label faceI = iter.key();
 
         if ((option_ == OWNER) || (option_ == ANY))
         {
-            label cellI = mesh_.faceOwner()[faceI];
+            const label cellI = mesh_.faceOwner()[faceI];
 
             addOrDelete(set, cellI, add);
         }
@@ -93,7 +88,7 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
         {
             if ((option_ == NEIGHBOUR) || (option_ == ANY))
             {
-                label cellI = mesh_.faceNeighbour()[faceI];
+                const label cellI = mesh_.faceNeighbour()[faceI];
 
                 addOrDelete(set, cellI, add);
             }
@@ -107,16 +102,10 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
         Map<label> facesPerCell(loadedSet.size());
 
-        for
-        (
-            faceSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(faceSet, loadedSet, iter)
         {
-            label faceI = iter.key();
-
-            label own = mesh_.faceOwner()[faceI];
+            const label faceI = iter.key();
+            const label own = mesh_.faceOwner()[faceI];
 
             Map<label>::iterator fndOwn = facesPerCell.find(own);
 
@@ -148,14 +137,9 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
 
         // Include cells that are referenced as many times as they have faces
         // -> all faces in set.
-        for
-        (
-            Map<label>::const_iterator iter = facesPerCell.begin();
-            iter != facesPerCell.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, facesPerCell, iter)
         {
-            label cellI = iter.key();
+            const label cellI = iter.key();
 
             if (iter() == mesh_.cells()[cellI].size())
             {
diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
index 983f25b490..c3f6777d8a 100644
--- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
+++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.H
@@ -113,9 +113,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceToCell();
+    //- Destructor
+    virtual ~faceToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
index b1ae275355..a7227a6479 100644
--- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
+++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.H
@@ -110,9 +110,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceZoneToCell();
+    //- Destructor
+    virtual ~faceZoneToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
index 2ac69f2039..3ab18bdc5f 100644
--- a/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
+++ b/src/meshTools/sets/cellSources/fieldToCell/fieldToCell.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~fieldToCell();
+    //- Destructor
+    virtual ~fieldToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
index d3e5275feb..2604cbb6ba 100644
--- a/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
+++ b/src/meshTools/sets/cellSources/labelToCell/labelToCell.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~labelToCell();
+    //- Destructor
+    virtual ~labelToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
index a48d577cab..7aeadce448 100644
--- a/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
+++ b/src/meshTools/sets/cellSources/nbrToCell/nbrToCell.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~nbrToCell();
+    //- Destructor
+    virtual ~nbrToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
index d7e74b46e9..24e566432f 100644
--- a/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
+++ b/src/meshTools/sets/cellSources/nearestToCell/nearestToCell.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~nearestToCell();
+    //- Destructor
+    virtual ~nearestToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
index 84913bbc70..42faac845b 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C
@@ -72,15 +72,9 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
     // Handle any selection
     if (option_ == ANY)
     {
-        for
-        (
-            pointSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pCells = mesh_.pointCells()[pointI];
 
             forAll(pCells, pCellI)
diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
index a527bbde57..572fb5a3eb 100644
--- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
+++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointToCell();
+    //- Destructor
+    virtual ~pointToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
index 985ee2dc3b..370781d797 100644
--- a/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
+++ b/src/meshTools/sets/cellSources/regionToCell/regionToCell.H
@@ -99,9 +99,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~regionToCell();
+    //- Destructor
+    virtual ~regionToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
index f680eb45ef..977c011d3d 100644
--- a/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
+++ b/src/meshTools/sets/cellSources/rotatedBoxToCell/rotatedBoxToCell.H
@@ -105,9 +105,8 @@ public:
         rotatedBoxToCell(const polyMesh& mesh, Istream&);
 
 
-    // Destructor
-
-        virtual ~rotatedBoxToCell();
+    //- Destructor
+    virtual ~rotatedBoxToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
index d8ad5d1d87..bf3524c085 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.H
@@ -103,9 +103,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~shapeToCell();
+    //- Destructor
+    virtual ~shapeToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
index 2e9139d76e..66f4e02969 100644
--- a/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
+++ b/src/meshTools/sets/cellSources/sphereToCell/sphereToCell.H
@@ -99,9 +99,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sphereToCell();
+    //- Destructor
+    virtual ~sphereToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
index 17f0f704a1..376f98f95e 100644
--- a/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
+++ b/src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.H
@@ -189,9 +189,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~surfaceToCell();
+    //- Destructor
+    virtual ~surfaceToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
index 3abd63008a..b17a410880 100644
--- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
+++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~zoneToCell();
+    //- Destructor
+    virtual ~zoneToCell();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
index 7fec89e9c2..50bc04377b 100644
--- a/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
+++ b/src/meshTools/sets/cellZoneSources/setToCellZone/setToCellZone.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~setToCellZone();
+    //- Destructor
+    virtual ~setToCellZone();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
index 24b98fedf8..4432b0d764 100644
--- a/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
+++ b/src/meshTools/sets/faceSources/boundaryToFace/boundaryToFace.H
@@ -86,9 +86,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~boundaryToFace();
+    //- Destructor
+    virtual ~boundaryToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
index f5c7398e20..575d53c739 100644
--- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
+++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~boxToFace();
+    //- Destructor
+    virtual ~boxToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
index 882c0a6e0b..431fad348c 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C
@@ -79,15 +79,9 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
     if (option_ == ALL)
     {
         // Add all faces from cell
-        for
-        (
-            cellSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(cellSet, loadedSet, iter)
         {
-            label cellI = iter.key();
-
+            const label cellI = iter.key();
             const labelList& cFaces = mesh_.cells()[cellI];
 
             forAll(cFaces, cFaceI)
@@ -100,7 +94,7 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
     {
         // Add all faces whose both neighbours are in set.
 
-        label nInt = mesh_.nInternalFaces();
+        const label nInt = mesh_.nInternalFaces();
         const labelList& own = mesh_.faceOwner();
         const labelList& nei = mesh_.faceNeighbour();
         const polyBoundaryMesh& patches = mesh_.boundaryMesh();
diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
index fbaf55142f..d01e25eb34 100644
--- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
+++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.H
@@ -114,9 +114,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cellToFace();
+    //- Destructor
+    virtual ~cellToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
index 4963145407..c18be1df05 100644
--- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
+++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceToFace();
+    //- Destructor
+    virtual ~faceToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
index c922b3b99f..6f923554a4 100644
--- a/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
+++ b/src/meshTools/sets/faceSources/labelToFace/labelToFace.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~labelToFace();
+    //- Destructor
+    virtual ~labelToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
index 85b8b4c9b0..8a1a18a051 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.C
@@ -150,9 +150,9 @@ void Foam::normalToFace::applyToSet
 
         DynamicList<label> toBeRemoved(set.size()/10);
 
-        forAllIter(topoSet, set, iter)
+        forAllConstIter(topoSet, set, iter)
         {
-            label faceI = iter.key();
+            const label faceI = iter.key();
 
             vector n = mesh_.faceAreas()[faceI];
             n /= mag(n) + VSMALL;
diff --git a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
index 67583a0744..c131dbd8da 100644
--- a/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
+++ b/src/meshTools/sets/faceSources/normalToFace/normalToFace.H
@@ -92,9 +92,8 @@ public:
         normalToFace(const polyMesh& mesh, Istream&);
 
 
-    // Destructor
-
-        virtual ~normalToFace();
+    //- Destructor
+    virtual ~normalToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
index 11861b4211..0853fbbd37 100644
--- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
+++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~patchToFace();
+    //- Destructor
+    virtual ~patchToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
index b3c7b9aa9c..92dd470149 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C
@@ -73,15 +73,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
     if (option_ == ANY)
     {
         // Add faces with any point in loadedSet
-        for
-        (
-            pointSet::const_iterator iter = loadedSet.begin();
-            iter != loadedSet.end();
-            ++iter
-        )
+        forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pFaces = mesh_.pointFaces()[pointI];
 
             forAll(pFaces, pFaceI)
@@ -99,13 +93,12 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
 
         forAllConstIter(pointSet, loadedSet, iter)
         {
-            label pointI = iter.key();
-
+            const label pointI = iter.key();
             const labelList& pFaces = mesh_.pointFaces()[pointI];
 
             forAll(pFaces, pFaceI)
             {
-                label faceI = pFaces[pFaceI];
+                const label faceI = pFaces[pFaceI];
 
                 Map<label>::iterator fndFace = numPoints.find(faceI);
 
@@ -123,14 +116,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
 
         // Include faces that are referenced as many times as there are points
         // in face -> all points of face
-        for
-        (
-            Map<label>::const_iterator iter = numPoints.begin();
-            iter != numPoints.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, numPoints, iter)
         {
-            label faceI = iter.key();
+            const label faceI = iter.key();
 
             if (iter() == mesh_.faces()[faceI].size())
             {
diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
index d5708cc14b..1893307621 100644
--- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
+++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.H
@@ -112,9 +112,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointToFace();
+    //- Destructor
+    virtual ~pointToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
index ac98654021..98b2e891ab 100644
--- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
+++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~zoneToFace();
+    //- Destructor
+    virtual ~zoneToFace();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
index 39b8c02058..41ad8b2fca 100644
--- a/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/faceZoneToFaceZone/faceZoneToFaceZone.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceZoneToFaceZone();
+    //- Destructor
+    virtual ~faceZoneToFaceZone();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
index c1f85f43e8..377c279ae1 100644
--- a/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setToFaceZone/setToFaceZone.H
@@ -88,9 +88,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~setToFaceZone();
+    //- Destructor
+    virtual ~setToFaceZone();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
index 2c88af3e17..306110730d 100644
--- a/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
+++ b/src/meshTools/sets/faceZoneSources/setsToFaceZone/setsToFaceZone.H
@@ -91,9 +91,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~setsToFaceZone();
+    //- Destructor
+    virtual ~setsToFaceZone();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
index 92160be389..06c5e5ff23 100644
--- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
+++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~boxToPoint();
+    //- Destructor
+    virtual ~boxToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
index a33dab098d..bd727589fe 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
@@ -68,15 +68,9 @@ void Foam::cellToPoint::combine(topoSet& set, const bool add) const
     cellSet loadedSet(mesh_, setName_);
 
     // Add all point from cells in loadedSet
-    for
-    (
-        cellSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(cellSet, loadedSet, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const labelList& cFaces = mesh_.cells()[cellI];
 
         forAll(cFaces, cFaceI)
diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
index 327c2180ee..0d5e693120 100644
--- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
+++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~cellToPoint();
+    //- Destructor
+    virtual ~cellToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
index 2f906e3d6c..a4fff893dc 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
@@ -68,12 +68,7 @@ void Foam::faceToPoint::combine(topoSet& set, const bool add) const
     faceSet loadedSet(mesh_, setName_);
 
     // Add all points from faces in loadedSet
-    for
-    (
-        faceSet::const_iterator iter = loadedSet.begin();
-        iter != loadedSet.end();
-        ++iter
-    )
+    forAllConstIter(faceSet, loadedSet, iter)
     {
         const face& f = mesh_.faces()[iter.key()];
 
diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
index a8e981bf68..61d865d14f 100644
--- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
+++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.H
@@ -109,9 +109,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceToPoint();
+    //- Destructor
+    virtual ~faceToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
index c2c515f4bf..bdc8e6be3b 100644
--- a/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
+++ b/src/meshTools/sets/pointSources/labelToPoint/labelToPoint.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~labelToPoint();
+    //- Destructor
+    virtual ~labelToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
index 5d02027691..040cf64c2c 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.H
@@ -94,9 +94,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~nearestToPoint();
+    //- Destructor
+    virtual ~nearestToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
index 7a8c2677e0..5efea5328f 100644
--- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
+++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointToPoint();
+    //- Destructor
+    virtual ~pointToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
index 03a5bc6bfc..f7ef86ef57 100644
--- a/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
+++ b/src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
@@ -117,9 +117,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~surfaceToPoint();
+    //- Destructor
+    virtual ~surfaceToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
index be8801284d..f4f2548535 100644
--- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
+++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.H
@@ -95,9 +95,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~zoneToPoint();
+    //- Destructor
+    virtual ~zoneToPoint();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
index 85c4aaf9b9..320ac8250c 100644
--- a/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
+++ b/src/meshTools/sets/pointZoneSources/setToPointZone/setToPointZone.H
@@ -87,9 +87,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~setToPointZone();
+    //- Destructor
+    virtual ~setToPointZone();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/topoSetSource/topoSetSource.H b/src/meshTools/sets/topoSetSource/topoSetSource.H
index c3271a8a7f..15071da67c 100644
--- a/src/meshTools/sets/topoSetSource/topoSetSource.H
+++ b/src/meshTools/sets/topoSetSource/topoSetSource.H
@@ -254,9 +254,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~topoSetSource();
+    //- Destructor
+    virtual ~topoSetSource();
 
 
     // Member Functions
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index d36a4081db..61daf2af67 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -134,9 +134,8 @@ public:
             );
 
 
-    // Destructor
-
-        virtual ~cellSet();
+    //- Destructor
+    virtual ~cellSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/cellZoneSet.H b/src/meshTools/sets/topoSets/cellZoneSet.H
index 99a7346bde..af0b6bb878 100644
--- a/src/meshTools/sets/topoSets/cellZoneSet.H
+++ b/src/meshTools/sets/topoSets/cellZoneSet.H
@@ -94,9 +94,8 @@ public:
 
 
 
-    // Destructor
-
-        virtual ~cellZoneSet();
+    //- Destructor
+    virtual ~cellZoneSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 21c359db05..1dea0b0e9b 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -182,7 +182,7 @@ void faceSet::sync(const polyMesh& mesh)
     }
 
     // Couple cyclic patches
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         const polyPatch& pp = patches[patchI];
 
@@ -191,7 +191,7 @@ void faceSet::sync(const polyMesh& mesh)
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
 
-            forAll (cycPatch, i)
+            forAll(cycPatch, i)
             {
                 label thisFaceI = cycPatch.start() + i;
                 label otherFaceI = cycPatch.transformGlobalFace(thisFaceI);
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index b698fabb30..582c8ff05a 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~faceSet();
+    //- Destructor
+    virtual ~faceSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/faceZoneSet.H b/src/meshTools/sets/topoSets/faceZoneSet.H
index e8fd1306cf..c863a7c8d0 100644
--- a/src/meshTools/sets/topoSets/faceZoneSet.H
+++ b/src/meshTools/sets/topoSets/faceZoneSet.H
@@ -99,9 +99,8 @@ public:
 
 
 
-    // Destructor
-
-        virtual ~faceZoneSet();
+    //- Destructor
+    virtual ~faceZoneSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index 6adc62d64f..5753425883 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~pointSet();
+    //- Destructor
+    virtual ~pointSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/pointZoneSet.H b/src/meshTools/sets/topoSets/pointZoneSet.H
index cfdcf79152..1f184db68d 100644
--- a/src/meshTools/sets/topoSets/pointZoneSet.H
+++ b/src/meshTools/sets/topoSets/pointZoneSet.H
@@ -97,9 +97,8 @@ public:
 
 
 
-    // Destructor
-
-        virtual ~pointZoneSet();
+    //- Destructor
+    virtual ~pointZoneSet();
 
 
     // Member functions
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 152213bad4..c578771759 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -154,12 +154,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
     // Iterate over map to see if anything changed
     bool changed = false;
 
-    for
-    (
-        labelHashSet::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, *this, iter)
     {
         if ((iter.key() < 0) || (iter.key() > map.size()))
         {
@@ -172,7 +167,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
                 << abort(FatalError);
         }
 
-        label newCellI = map[iter.key()];
+        const label newCellI = map[iter.key()];
 
         if (newCellI != iter.key())
         {
@@ -187,14 +182,9 @@ void topoSet::topoSet::updateLabels(const labelList& map)
     {
         labelHashSet newSet(2*size());
 
-        for
-        (
-            labelHashSet::const_iterator iter = begin();
-            iter != end();
-            ++iter
-        )
+        forAllConstIter(labelHashSet, *this, iter)
         {
-            label newCellI = map[iter.key()];
+            const label newCellI = map[iter.key()];
 
             if (newCellI >= 0)
             {
@@ -209,12 +199,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
 
 void topoSet::topoSet::check(const label maxLabel)
 {
-    for
-    (
-        topoSet::const_iterator iter = begin();
-        iter != end();
-        ++iter
-    )
+    forAllConstIter(topoSet, *this, iter)
     {
         if ((iter.key() < 0) || (iter.key() > maxLabel))
         {
@@ -309,9 +294,7 @@ void topoSet::writeDebug
 
         writeDebug(os, coords, halfLen, iter, n);
 
-        os<< endl
-          << "  .." << endl
-          << endl;
+        os  << nl << "  .." << nl << endl;
 
         for (; n < size() - halfLen; ++n)
         {
@@ -505,12 +488,7 @@ void topoSet::subset(const topoSet& set)
     clear();
     resize(2*min(currentSet.size(), set.size()));
 
-    for
-    (
-        labelHashSet::const_iterator iter = currentSet.begin();
-        iter != currentSet.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, currentSet, iter)
     {
         if (set.found(iter.key()))
         {
@@ -523,12 +501,7 @@ void topoSet::subset(const topoSet& set)
 
 void topoSet::addSet(const topoSet& set)
 {
-    for
-    (
-        topoSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(topoSet, set, iter)
     {
         insert(iter.key());
     }
@@ -537,12 +510,7 @@ void topoSet::addSet(const topoSet& set)
 
 void topoSet::deleteSet(const topoSet& set)
 {
-    for
-    (
-        topoSet::const_iterator iter = set.begin();
-        iter != set.end();
-        ++iter
-    )
+    forAllConstIter(topoSet, set, iter)
     {
         erase(iter.key());
     }
@@ -574,9 +542,7 @@ void topoSet::writeDebug(Ostream& os, const label maxLen) const
 
         writeDebug(os, halfLen, iter, n);
 
-        os<< endl
-          << "  .." << endl
-          << endl;
+        os  << nl << "  .." << nl << endl;
 
         for (; n < size() - halfLen; ++n)
         {
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index 3d2be25504..466af052bc 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -257,9 +257,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~topoSet();
+    //- Destructor
+    virtual ~topoSet();
 
 
     // Member functions
diff --git a/src/meshTools/surfaceSets/surfaceSets.C b/src/meshTools/surfaceSets/surfaceSets.C
index e247130ec6..ae286bd0db 100644
--- a/src/meshTools/surfaceSets/surfaceSets.C
+++ b/src/meshTools/surfaceSets/surfaceSets.C
@@ -121,12 +121,7 @@ License
 //    // Snap outside points to surface
 //    pointField newPoints(points);
 //
-//    for
-//    (
-//        labelHashSet::const_iterator iter = flatCandidates.begin();
-//        iter != flatCandidates.end();
-//        ++iter
-//    )
+//    forAllConstIter(labelHashSet, flatCandidates, iter)
 //    {
 //        const cell& cFaces = cells[iter.key()];
 //
@@ -152,12 +147,7 @@ License
 //
 //    // Calculate new volume for mixed cells
 //    label nRemoved = 0;
-//    for
-//    (
-//        labelHashSet::const_iterator iter = flatCandidates.begin();
-//        iter != flatCandidates.end();
-//        ++iter
-//    )
+//    forAllConstIter(labelHashSet, flatCandidates, iter)
 //    {
 //        label cellI = iter.key();
 //
@@ -404,15 +394,9 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
 
     labelHashSet mixedOnlyCells(internalCells.size());
 
-    for
-    (
-        labelHashSet::const_iterator iter = internalCells.begin();
-        iter != internalCells.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, internalCells, iter)
     {
-        label cellI = iter.key();
-
+        const label cellI = iter.key();
         const cell& cFaces = cells[cellI];
 
         label usesMixedOnly = true;
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index 83075081d0..faf68b30bd 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -255,15 +255,10 @@ Foam::edgeSurface::edgeSurface
     // Add intersection edges to faceEdges
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    for
-    (
-        labelPairLookup::const_iterator iter = inter.facePairToEdge().begin();
-        iter != inter.facePairToEdge().end();
-        ++iter
-    )
+    forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
     {
         // Edge label in intersection
-        label edgeI = iter();
+        const label edgeI = iter();
 
         // Get the face from the correct surface
         const FixedList<label, 2>& twoFaces = iter.key();
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 53fd83a0d7..7ae4cffe8c 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -329,12 +329,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
     }
 
     // Shrink it
-    for
-    (
-        Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
-        iter != facePointEdges.end();
-        ++iter
-    )
+    forAllIter(Map< DynamicList<label> >, facePointEdges, iter)
     {
         iter().shrink();
 
@@ -358,17 +353,13 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         {
             label edgeI = fEdges[i];
             const edge& e = edges[edgeI];
-            Pout<< "    " << edgeI << ' ' << e << points[e.start()]
+            Pout<< "    " << edgeI << ' ' << e
+                << points[e.start()]
                 << points[e.end()] << endl;
         }
 
         Pout<< "    Constructed point-edge adressing:" << endl;
-        for
-        (
-            Map<DynamicList<label> >::iterator iter = facePointEdges.begin();
-            iter != facePointEdges.end();
-            ++iter
-        )
+        forAllConstIter(Map< DynamicList<label> >, facePointEdges, iter)
         {
             Pout<< "    vertex " << iter.key() << " is connected to edges "
                 << iter() << endl;
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index e06f8462c0..ed171db033 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -826,12 +826,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
         OFstream objStream("nearestSamples.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<label>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, nearest, iter)
         {
             meshTools::writeOBJ(objStream, samples[iter.key()]); vertI++;
             meshTools::writeOBJ(objStream, surfPoints[iter()]); vertI++;
@@ -957,14 +952,9 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
         OFstream objStream("nearestEdges.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<label>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<label>, nearest, iter)
         {
-            label sampleI = iter.key();
+            const label sampleI = iter.key();
 
             meshTools::writeOBJ(objStream, samples[sampleI]); vertI++;
 
@@ -1119,14 +1109,9 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
         OFstream objStream("nearestEdges.obj");
 
         label vertI = 0;
-        for
-        (
-            Map<pointIndexHit>::const_iterator iter = nearest.begin();
-            iter != nearest.end();
-            ++iter
-        )
+        forAllConstIter(Map<pointIndexHit>, nearest, iter)
         {
-            label sampleEdgeI = iter.key();
+            const label sampleEdgeI = iter.key();
 
             const edge& sampleEdge = sampleEdges[sampleEdgeI];
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
index d615a7453a..1fd9d14978 100644
--- a/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
+++ b/src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
@@ -2341,17 +2341,10 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
 
     label newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
-
         const pointField& points = patch.points();
 
         label nTriTotal = 0;
@@ -2402,19 +2395,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
 
     newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         surface.patches()[newPatchI].name() = patch.name();
-
         surface.patches()[newPatchI].geometricType() = patch.type();
 
         newPatchI++;
@@ -2460,15 +2446,9 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
 
     label newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         label nTriTotal = 0;
@@ -2518,19 +2498,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
 
     newPatchI = 0;
 
-    for
-    (
-        labelHashSet::const_iterator iter = includePatches.begin();
-        iter != includePatches.end();
-        ++iter
-    )
+    forAllConstIter(labelHashSet, includePatches, iter)
     {
-        label patchI = iter.key();
-
+        const label patchI = iter.key();
         const polyPatch& patch = bMesh[patchI];
 
         surface.patches()[newPatchI].name() = patch.name();
-
         surface.patches()[newPatchI].geometricType() = patch.type();
 
         newPatchI++;
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index e8e7785fb0..916557e83d 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -56,7 +56,7 @@ void twoDPointCorrector::calcAddressing() const
     // Try and find a wedge patch
     const polyBoundaryMesh& patches = mesh_.boundaryMesh();
 
-    forAll (patches, patchI)
+    forAll(patches, patchI)
     {
         if (isA<wedgePolyPatch>(patches[patchI]))
         {
@@ -76,7 +76,7 @@ void twoDPointCorrector::calcAddressing() const
     // Try to find an empty patch with faces
     if (!isWedge)
     {
-        forAll (patches, patchI)
+        forAll(patches, patchI)
         {
             if (isA<emptyPolyPatch>(patches[patchI]) && patches[patchI].size())
             {
@@ -122,7 +122,7 @@ void twoDPointCorrector::calcAddressing() const
 
     label nNormalEdges = 0;
 
-    forAll (meshEdges, edgeI)
+    forAll(meshEdges, edgeI)
     {
         vector edgeVector =
             meshEdges[edgeI].vec(meshPoints)/
@@ -269,7 +269,7 @@ void twoDPointCorrector::correctPoints(pointField& p) const
     const labelList& neIndices = normalEdgeIndices();
     const vector& pn = planeNormal();
 
-    forAll (neIndices, edgeI)
+    forAll(neIndices, edgeI)
     {
         point& pStart = p[meshEdges[neIndices[edgeI]].start()];
 
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
index 057a873478..3c61f57236 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.H
@@ -105,9 +105,8 @@ public:
         twoDPointCorrector(const polyMesh& mesh);
 
 
-    // Destructor
-
-        ~twoDPointCorrector();
+    //- Destructor
+    ~twoDPointCorrector();
 
 
     // Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
index 537605e48b..d729fe9bd3 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.H
@@ -160,10 +160,9 @@ public:
         {}
 
 
-    // Destructor
-
-        virtual ~decompositionMethod()
-        {}
+    //- Destructor
+    virtual ~decompositionMethod()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
index 4fe2022b14..62eef72ae3 100644
--- a/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
@@ -179,10 +179,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~hierarchGeomDecomp()
-        {}
+    //- Destructor
+    virtual ~hierarchGeomDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
index 8e8fe35b46..e3da10ccac 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.H
@@ -81,10 +81,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~manualDecomp()
-        {}
+    //- Destructor
+    virtual ~manualDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
index db629bd4bb..714916f62d 100644
--- a/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
+++ b/src/parallel/decompose/decompositionMethods/simpleGeomDecomp/simpleGeomDecomp.H
@@ -84,10 +84,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~simpleGeomDecomp()
-        {}
+    //- Destructor
+    virtual ~simpleGeomDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.H b/src/parallel/decompose/metisDecomp/metisDecomp.H
index 9e2960e843..f18ba8bd0f 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.H
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.H
@@ -84,10 +84,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~metisDecomp()
-        {}
+    //- Destructor
+    virtual ~metisDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
index 7317e2cc4a..45649a0b81 100644
--- a/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
+++ b/src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
@@ -87,10 +87,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~ptscotchDecomp()
-        {}
+    //- Destructor
+    virtual ~ptscotchDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/decompose/scotchDecomp/scotchDecomp.H b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
index d6cb3bb787..249b191f6c 100644
--- a/src/parallel/decompose/scotchDecomp/scotchDecomp.H
+++ b/src/parallel/decompose/scotchDecomp/scotchDecomp.H
@@ -87,10 +87,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~scotchDecomp()
-        {}
+    //- Destructor
+    virtual ~scotchDecomp()
+    {}
 
 
     // Member Functions
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
index c1c3603585..5523e079f9 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructorReconstructFields.C
@@ -46,7 +46,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -74,7 +74,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
     PtrList<fvPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, fvPatchField, volMesh>& procField =
             procFields[procI];
@@ -244,7 +244,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -272,7 +272,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
     PtrList<fvsPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
             procFields[procI];
@@ -285,7 +285,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         {
             labelList curAddr(faceProcAddressing_[procI]);
 
-            forAll (curAddr, addrI)
+            forAll(curAddr, addrI)
             {
                 curAddr[addrI] -= 1;
             }
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
index fd6303c836..e9bc8bd927 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.C
@@ -63,7 +63,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
                     .meshPoints();
 
                 // Create the inverse-addressing of the patch point labels.
-                forAll (patchPointLabels, pointi)
+                forAll(patchPointLabels, pointi)
                 {
                     pointMap[patchPointLabels[pointi]] = pointi;
                 }
@@ -71,7 +71,7 @@ Foam::pointFieldReconstructor::pointFieldReconstructor
                 const labelList& procPatchPoints =
                     procMesh.boundary()[patchi].meshPoints();
 
-                forAll (procPatchPoints, pointi)
+                forAll(procPatchPoints, pointi)
                 {
                     procPatchAddr[pointi] =
                         pointMap
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
index 5f67a7c48e..0d0e29913e 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructorReconstructFields.C
@@ -37,7 +37,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, proci)
+    forAll(procMeshes_, proci)
     {
         procFields.set
         (
@@ -65,7 +65,7 @@ Foam::pointFieldReconstructor::reconstructField(const IOobject& fieldIoObject)
     PtrList<pointPatchField<Type> > patchFields(mesh_.boundary().size());
 
 
-    forAll (procMeshes_, proci)
+    forAll(procMeshes_, proci)
     {
         const GeometricField<Type, pointPatchField, pointMesh>&
             procField = procFields[proci];
diff --git a/src/parallel/reconstruct/reconstruct/processorMeshes.C b/src/parallel/reconstruct/reconstruct/processorMeshes.C
index be03bf0ae7..5e9b27ff44 100644
--- a/src/parallel/reconstruct/reconstruct/processorMeshes.C
+++ b/src/parallel/reconstruct/reconstruct/processorMeshes.C
@@ -31,7 +31,7 @@ License
 
 void Foam::processorMeshes::read()
 {
-    forAll (databases_, procI)
+    forAll(databases_, procI)
     {
         meshes_.set
         (
@@ -144,7 +144,7 @@ Foam::fvMesh::readUpdateState Foam::processorMeshes::readUpdate()
 {
     fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
 
-    forAll (databases_, procI)
+    forAll(databases_, procI)
     {
         // Check if any new meshes need to be read.
         fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@@ -196,7 +196,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
     // Read the field for all the processors
     PtrList<pointIOField> procsPoints(meshes_.size());
 
-    forAll (meshes_, procI)
+    forAll(meshes_, procI)
     {
         procsPoints.set
         (
@@ -219,7 +219,7 @@ void Foam::processorMeshes::reconstructPoints(fvMesh& mesh)
     // Create the new points
     vectorField newPoints(mesh.nPoints());
 
-    forAll (meshes_, procI)
+    forAll(meshes_, procI)
     {
         const vectorField& procPoints = procsPoints[procI];
 
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
index a2cf670b2b..70ac1ee3ed 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C
@@ -96,7 +96,7 @@ void Foam::reconstructLagrangianFields
     const IOobjectList& objects
 )
 {
-    word fieldClassName(IOField<Type>::typeName);
+    const word fieldClassName(IOField<Type>::typeName);
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
@@ -105,7 +105,7 @@ void Foam::reconstructLagrangianFields
         Info<< "    Reconstructing lagrangian "
             << fieldClassName << "s\n" << endl;
 
-        forAllIter(IOobjectList, fields, fieldIter)
+        forAllConstIter(IOobjectList, fields, fieldIter)
         {
             Info<< "        " << fieldIter()->name() << endl;
             reconstructLagrangianField<Type>
diff --git a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
index 726c209ee3..683a976b15 100644
--- a/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
+++ b/src/parallel/reconstruct/reconstruct/reconstructLagrangianPositions.C
@@ -52,7 +52,7 @@ void Foam::reconstructLagrangianPositions
 
         Cloud<passiveParticle> lpi(meshes[i], cloudName, false);
 
-        forAllIter(Cloud<passiveParticle>, lpi, iter)
+        forAllConstIter(Cloud<passiveParticle>, lpi, iter)
         {
             const passiveParticle& ppi = iter();
 
diff --git a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
index eb20eeb3ba..63b0b6b142 100644
--- a/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
+++ b/src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.H
@@ -193,9 +193,8 @@ public:
         addSubtract();
 
 
-    // Destructor
-
-        virtual ~addSubtract();
+    //- Destructor
+    virtual ~addSubtract();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/calcType/calcType.H b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
index cb03558690..de6fbe1750 100644
--- a/src/postProcessing/foamCalcFunctions/calcType/calcType.H
+++ b/src/postProcessing/foamCalcFunctions/calcType/calcType.H
@@ -131,9 +131,8 @@ public:
         static autoPtr<calcType> New(const word& calcTypeName);
 
 
-    // Destructor
-
-        virtual ~calcType();
+    //- Destructor
+    virtual ~calcType();
 
 
     // Member Functions
diff --git a/src/postProcessing/foamCalcFunctions/field/components/components.H b/src/postProcessing/foamCalcFunctions/field/components/components.H
index ea710203f0..9f3650d3a8 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/components.H
+++ b/src/postProcessing/foamCalcFunctions/field/components/components.H
@@ -114,9 +114,8 @@ public:
         components();
 
 
-    // Destructor
-
-        virtual ~components();
+    //- Destructor
+    virtual ~components();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/div/div.H b/src/postProcessing/foamCalcFunctions/field/div/div.H
index 42312b4a10..ce22a4ddea 100644
--- a/src/postProcessing/foamCalcFunctions/field/div/div.H
+++ b/src/postProcessing/foamCalcFunctions/field/div/div.H
@@ -114,9 +114,8 @@ public:
         div();
 
 
-    // Destructor
-
-        virtual ~div();
+    //- Destructor
+    virtual ~div();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
index aa7db44bdd..e4ed56a0b1 100644
--- a/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
+++ b/src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.H
@@ -113,9 +113,8 @@ public:
         interpolate();
 
 
-    // Destructor
-
-        virtual ~interpolate();
+    //- Destructor
+    virtual ~interpolate();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/mag/mag.H b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
index ac333636c6..8dc05514f2 100644
--- a/src/postProcessing/foamCalcFunctions/field/mag/mag.H
+++ b/src/postProcessing/foamCalcFunctions/field/mag/mag.H
@@ -113,9 +113,8 @@ public:
         mag();
 
 
-    // Destructor
-
-        virtual ~mag();
+    //- Destructor
+    virtual ~mag();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
index 19166d3604..b027a28b98 100644
--- a/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
+++ b/src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.H
@@ -114,9 +114,8 @@ public:
         magGrad();
 
 
-    // Destructor
-
-        virtual ~magGrad();
+    //- Destructor
+    virtual ~magGrad();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
index 19422b3ed6..2e1167d2ba 100644
--- a/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
+++ b/src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.H
@@ -113,9 +113,8 @@ public:
         magSqr();
 
 
-    // Destructor
-
-        virtual ~magSqr();
+    //- Destructor
+    virtual ~magSqr();
 };
 
 
diff --git a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
index 2a5b94c44c..446d1731d2 100644
--- a/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
+++ b/src/postProcessing/foamCalcFunctions/field/randomise/randomise.H
@@ -116,9 +116,8 @@ public:
         randomise();
 
 
-    // Destructor
-
-        virtual ~randomise();
+    //- Destructor
+    virtual ~randomise();
 };
 
 
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 980a308557..d8cbe09eb9 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -6,7 +6,7 @@ wmake libso field
 wmake libso forces
 wmake libso IO
 wmake libso utilities
-wmake libso residualControl
+wmake libso jobControl
 wmake libso systemCall
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
index 0f02f40194..841768636d 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
+++ b/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(writeRegisteredObject, 0);
-}
+defineTypeNameAndDebug(Foam::writeRegisteredObject, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index 3e186c89e2..70187fad00 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -36,29 +36,29 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     fieldAverage1
     {
         // Type of functionObject
-        type fieldAverage;
+        type            fieldAverage;
 
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libfieldAverage.so");
 
         // Function object enabled flag
-        enabled         true;                             
+        enabled         true;
 
         // When to output the average fields
-        outputControl   outputTime;                       
+        outputControl   outputTime;
 
         // Fields to be averaged - runTime modifiable
         fields
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
index f23441d467..b013114ee7 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
+++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.C
@@ -31,10 +31,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(fieldMinMax, 0);
-}
+defineTypeNameAndDebug(Foam::fieldMinMax, 0);
 
 
 template<>
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
index b3fbf569cd..9d65cefc57 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
@@ -29,32 +29,28 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0);
+
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>::
+names[] =
 {
-    namespace fieldValues
-    {
-        defineTypeNameAndDebug(cellSource, 0);
-    }
+    "cellZone"
+};
 
-    template<>
-    const char* NamedEnum<fieldValues::cellSource::sourceType, 1>::
-        names[] = {"cellZone"};
+const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 1>
+    Foam::fieldValues::cellSource::sourceTypeNames_;
 
-    const NamedEnum<fieldValues::cellSource::sourceType, 1>
-        fieldValues::cellSource::sourceTypeNames_;
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>::
+names[] =
+{
+    "none", "sum", "volAverage",
+    "volIntegrate", "weightedAverage", "min", "max"
+};
 
-    template<>
-    const char* NamedEnum<fieldValues::cellSource::operationType, 7>::
-        names[] =
-        {
-            "none", "sum", "volAverage",
-            "volIntegrate", "weightedAverage", "min", "max"
-        };
-
-    const NamedEnum<fieldValues::cellSource::operationType, 7>
-        fieldValues::cellSource::operationTypeNames_;
-
-}
+const Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>
+    Foam::fieldValues::cellSource::operationTypeNames_;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -238,4 +234,3 @@ void Foam::fieldValues::cellSource::write()
 
 
 // ************************************************************************* //
-
diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict
index f4edb29be0..c7cacc1a85 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict
@@ -37,16 +37,16 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
-(
+{
     faceObj1
     {
         type            faceSource;
@@ -69,6 +69,7 @@ functions
 
         // Operation: areaAverage/sum/weightedAverage ...
         operation       areaAverage;
+
         fields
         (
             p
@@ -88,6 +89,7 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       sum;
+
         fields
         (
             phi
@@ -105,13 +107,13 @@ functions
         source          cellZone;
         sourceName      c0;
         operation       volAverage;
+
         fields
         (
             p
             U
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
index 6eb950c563..b7d372f9ce 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
@@ -33,32 +33,25 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
+defineTypeNameAndDebug(Foam::fieldValues::faceSource, 0);
+
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::sourceType, 2>::
+names[] =
 {
-    namespace fieldValues
-    {
-        defineTypeNameAndDebug(faceSource, 0);
-    }
+    "faceZone", "patch"
+};
 
-    template<>
-    const char* NamedEnum<fieldValues::faceSource::sourceType, 2>::
-        names[] = {"faceZone", "patch"};
+template<>
+const char* Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>::
+names[] =
+{
+    "none", "sum", "areaAverage",
+    "areaIntegrate", "weightedAverage", "min", "max"
+};
 
-    const NamedEnum<fieldValues::faceSource::sourceType, 2>
-        fieldValues::faceSource::sourceTypeNames_;
-
-    template<>
-    const char* NamedEnum<fieldValues::faceSource::operationType, 7>::
-        names[] =
-        {
-            "none", "sum", "areaAverage",
-            "areaIntegrate", "weightedAverage", "min", "max"
-        };
-
-    const NamedEnum<fieldValues::faceSource::operationType, 7>
-        fieldValues::faceSource::operationTypeNames_;
-
-}
+const Foam::NamedEnum<Foam::fieldValues::faceSource::operationType, 7>
+    Foam::fieldValues::faceSource::operationTypeNames_;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
index aa304a259f..fbe59b234c 100644
--- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict
+++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 functions
-(
+{
     readFields1
     {
         type            readFields;
@@ -24,11 +24,13 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
         fields
         (
             interpolateU
         );
     }
+
     faceObj2
     {
         type            faceSource;
@@ -41,12 +43,12 @@ functions
         source          faceZone;
         sourceName      f0;
         operation       areaAverage;
+
         fields
         (
             interpolateU
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.C b/src/postProcessing/functionObjects/field/readFields/readFields.C
index fa1e9e7ac0..aecea77960 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.C
+++ b/src/postProcessing/functionObjects/field/readFields/readFields.C
@@ -28,10 +28,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(readFields, 0);
-}
+defineTypeNameAndDebug(Foam::readFields, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 37d396b90c..fe4f4d287f 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -166,8 +166,7 @@ public:
 
 
     //- Destructor
-
-        virtual ~streamLine();
+    virtual ~streamLine();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 1a2a101b37..9174e35781 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -31,14 +31,17 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(streamLineParticle, 0);
+
     defineParticleTypeNameAndDebug(streamLineParticle, 0);
+
     defineTemplateTypeNameAndDebugWithName
     (
         IOField<vectorField>,
         "vectorFieldField",
         0
     );
-};
+}
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
index 12278502d0..095b08ee42 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticleCloud.C
@@ -30,7 +30,7 @@ License
 namespace Foam
 {
     defineTemplateTypeNameAndDebug(Cloud<streamLineParticle>, 0);
-};
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 3b8ee51eae..d7acd9ad4c 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(forceCoeffs, 0);
-}
+defineTypeNameAndDebug(Foam::forceCoeffs, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index c58ab692f1..844366eefb 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -39,10 +39,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(forces, 0);
-}
+defineTypeNameAndDebug(Foam::forces, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
index d750bb3a7f..becacd749c 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedAxis, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedAxis,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
index 0051aae41a..6a17da99c9 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedAxis/fixedAxis.H
@@ -87,9 +87,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~fixedAxis();
+    //- Destructor
+    virtual ~fixedAxis();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
index 877706a163..b2e88aa657 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedLine, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedLine,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
index de956e4301..e574769cd7 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedLine/fixedLine.H
@@ -88,9 +88,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~fixedLine();
+    //- Destructor
+    virtual ~fixedLine();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
index ea5f0e54c2..6a6839b9be 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedOrientation, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedOrientation,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
index a6d904d2bb..5cdbcf99a3 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedOrientation/fixedOrientation.H
@@ -82,9 +82,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~fixedOrientation();
+    //- Destructor
+    virtual ~fixedOrientation();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
index e8b4dcb61e..38544533ce 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPlane, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPlane,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
index aa5b8184a2..a16b3211ee 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPlane/fixedPlane.H
@@ -86,9 +86,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~fixedPlane();
+    //- Destructor
+    virtual ~fixedPlane();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
index abe67667a9..c1a35d85c0 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionConstraints
 {
     defineTypeNameAndDebug(fixedPoint, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionConstraint,
         fixedPoint,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
index 6ab09b318b..d680f87384 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/fixedPoint/fixedPoint.H
@@ -87,9 +87,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~fixedPoint();
+    //- Destructor
+    virtual ~fixedPoint();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
index 85899e1ef2..ccb684ed96 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.H
@@ -119,9 +119,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sixDoFRigidBodyMotionConstraint();
+    //- Destructor
+    virtual ~sixDoFRigidBodyMotionConstraint();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
index 14c364b351..704d48fe3e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.C
@@ -35,14 +35,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearAxialAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
index 8dde21bcdc..8f009c23f4 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearAxialAngularSpring/linearAxialAngularSpring.H
@@ -94,9 +94,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~linearAxialAngularSpring();
+    //- Destructor
+    virtual ~linearAxialAngularSpring();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
index 5fb6dfc3fe..2a1edc1c55 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(linearSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         linearSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
index 5c2747511f..a80d3cbc57 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/linearSpring/linearSpring.H
@@ -97,9 +97,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~linearSpring();
+    //- Destructor
+    virtual ~linearSpring();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
index c1c91ed153..a5f053d325 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.H
@@ -112,9 +112,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sixDoFRigidBodyMotionRestraint();
+    //- Destructor
+    virtual ~sixDoFRigidBodyMotionRestraint();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
index 00953da36f..df10f1e8ef 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.C
@@ -34,14 +34,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(sphericalAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         sphericalAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
index 28d7d05721..f13394499e 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/sphericalAngularSpring/sphericalAngularSpring.H
@@ -91,9 +91,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~sphericalAngularSpring();
+    //- Destructor
+    virtual ~sphericalAngularSpring();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
index b4022f987a..285eb7ac10 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.C
@@ -36,14 +36,15 @@ namespace Foam
 namespace sixDoFRigidBodyMotionRestraints
 {
     defineTypeNameAndDebug(tabulatedAxialAngularSpring, 0);
+
     addToRunTimeSelectionTable
     (
         sixDoFRigidBodyMotionRestraint,
         tabulatedAxialAngularSpring,
         dictionary
     );
-};
-};
+}
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
index 9ca1d01b5b..4f270dfa8c 100644
--- a/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
+++ b/src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionRestraint/tabulatedAxialAngularSpring/tabulatedAxialAngularSpring.H
@@ -101,9 +101,8 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~tabulatedAxialAngularSpring();
+    //- Destructor
+    virtual ~tabulatedAxialAngularSpring();
 
 
     // Member Functions
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
new file mode 100644
index 0000000000..03a93b6bf1
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/Make/files
@@ -0,0 +1,7 @@
+abortCalculation/abortCalculation.C
+abortCalculation/abortCalculationFunctionObject.C
+
+residualControl/residualControl.C
+residualControl/residualControlFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/residualControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/Make/options
rename to src/postProcessing/functionObjects/jobControl/Make/options
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
similarity index 98%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
index 775ac861bf..9cd6a2af07 100644
--- a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
@@ -31,10 +31,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(abortCalculation, 0);
-}
+defineTypeNameAndDebug(Foam::abortCalculation, 0);
+
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/IOresidualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/IOresidualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
similarity index 72%
rename from src/postProcessing/functionObjects/residualControl/controlDict
rename to src/postProcessing/functionObjects/jobControl/residualControl/controlDict
index 0af8ff7c9a..aae3ee4d5e 100644
--- a/src/postProcessing/functionObjects/residualControl/controlDict
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
@@ -1,4 +1,4 @@
-*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.6                                   |
@@ -37,31 +37,32 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
-
+runTimeModifiable true;
 
 functions
-(
+{
     convergenceChecks
     {
-        type           residualControl;
-        functionObjectLibs ( "libresidualControl.so" );
-        outputControl  timeStep;
-        outputInterval 1;
+        type            residualControl;
+        functionObjectLibs ( "libjobControl.so" );
+        outputControl   timeStep;
+        outputInterval  1;
 
         maxResiduals
-        (
-            (p          5e-4)
-            (U          1e-3)
-        );
-    }
-);
+        {
+            p       5e-4;
+            U       1e-3;
 
+            // possibly check turbulence fields
+            "(k|epsilon|omega)" 1e-3;
+        }
+    }
+}
 
 // ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
similarity index 86%
rename from src/postProcessing/functionObjects/residualControl/residualControl.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
index aed8e38dc1..a7ad2233cf 100644
--- a/src/postProcessing/functionObjects/residualControl/residualControl.C
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
@@ -24,40 +24,35 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "residualControl.H"
-#include "dictionary.H"
 #include "fvMesh.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(residualControl, 0);
-}
+defineTypeNameAndDebug(Foam::residualControl, 0);
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-bool Foam::residualControl::checkCriteria(const bool output) const
+bool Foam::residualControl::checkCriteria(const bool verbose) const
 {
     bool achieved = true;
     const fvMesh& mesh = static_cast<const fvMesh&>(obr_);
     const dictionary& solverDict = mesh.solverPerformanceDict();
-    forAll(maxResiduals_, i)
+
+    forAllConstIter(dictionary, solverDict, iter)
     {
-        const word& variableName = maxResiduals_[i].first();
-        if (solverDict.found(variableName))
+        const word& variableName = iter().keyword();
+        scalar maxResidual;
+
+        if (maxResiduals_.readIfPresent(variableName, maxResidual))
         {
-            const scalar maxResidual = maxResiduals_[i].second();
-
-            const lduMatrix::solverPerformance
-                sp(solverDict.lookup(variableName));
-
-            const scalar eqnResidual = sp.initialResidual();
+            const scalar eqnResidual =
+                lduMatrix::solverPerformance(iter().stream()).initialResidual();
 
             achieved = achieved && (eqnResidual < maxResidual);
 
-            if (output)
+            if (verbose)
             {
                 Info<< "    " << variableName
                     << ": requested max residual = " << maxResidual
@@ -121,7 +116,7 @@ void Foam::residualControl::read(const dictionary& dict)
 {
     if (active_)
     {
-        dict.lookup("maxResiduals") >> maxResiduals_;
+        maxResiduals_ = dict.subDict("maxResiduals");
     }
 }
 
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
similarity index 90%
rename from src/postProcessing/functionObjects/residualControl/residualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
index c222019298..691fb08928 100644
--- a/src/postProcessing/functionObjects/residualControl/residualControl.H
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
@@ -37,8 +37,8 @@ SourceFiles
 #ifndef residualControl_H
 #define residualControl_H
 
+#include "dictionary.H"
 #include "pointFieldFwd.H"
-#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -69,8 +69,8 @@ protected:
         //- On/off switch - on if obr_ is an fvMesh object
         bool active_;
 
-        //- List of variable name vs max residual
-        List<Tuple2<word, scalar> > maxResiduals_;
+        //- Dictionary of variable names vs max residual
+        dictionary maxResiduals_;
 
         //- Flag to indicate whether convergence criteria have been met
         bool criteriaSatisfied_;
@@ -79,7 +79,7 @@ protected:
     // Protected Member Functions
 
         //- Perform residual control checks
-        bool checkCriteria(const bool output) const;
+        bool checkCriteria(const bool verbose) const;
 
         //- Disallow default bitwise copy construct
         residualControl(const residualControl&);
@@ -113,7 +113,7 @@ public:
 
     // Member Functions
 
-        //- Return name of the system call set
+        //- Return name of the residual criteria check name
         virtual const word& name() const
         {
             return name_;
@@ -122,13 +122,13 @@ public:
         //- Read the system calls
         virtual void read(const dictionary&);
 
-        //- Execute the "executeCalls" at each time-step
+        //- Check the residual criteria at each time-step
         virtual void execute();
 
-        //- Execute the "endCalls" at the final time-loop
+        //- Report residual criteria check at the final time-loop
         virtual void end();
 
-        //- Write, execute the "writeCalls"
+        //- Write, not used
         virtual void write();
 
         //- Update for changes of mesh
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/Make/files b/src/postProcessing/functionObjects/residualControl/Make/files
deleted file mode 100644
index c3bc44fe41..0000000000
--- a/src/postProcessing/functionObjects/residualControl/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-residualControl.C
-residualControlFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libresidualControl
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/systemCall/systemCall.C
index bcafbf4bf0..7d477cb413 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.C
+++ b/src/postProcessing/functionObjects/systemCall/systemCall.C
@@ -29,10 +29,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(systemCall, 0);
-}
+defineTypeNameAndDebug(Foam::systemCall, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 1812a0b448..a93fad2eda 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -1,6 +1,3 @@
-abortCalculation/abortCalculation.C
-abortCalculation/abortCalculationFunctionObject.C
-
 staticPressure/staticPressure.C
 staticPressure/staticPressureFunctionObject.C
 
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
index 9eac0dbfa7..99d825fdcd 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.C
@@ -34,10 +34,7 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(dsmcFields, 0);
-}
+defineTypeNameAndDebug(Foam::dsmcFields, 0);
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
index f0977a0226..94c62f968b 100644
--- a/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
+++ b/src/postProcessing/functionObjects/utilities/staticPressure/staticPressure.C
@@ -29,10 +29,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(staticPressure, 0);
-}
+defineTypeNameAndDebug(Foam::staticPressure, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
index 635cefc4e8..06ade1c964 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict
@@ -37,29 +37,30 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     fileUpdate1
     {
-        type              timeActivatedFileUpdate;
+        type            timeActivatedFileUpdate;
         functionObjectLibs ("libutilityFunctionObjects.so");
-        outputControl     timeStep;
-        outputInterval    1;
-        fileToUpdate      "$FOAM_CASE/system/fvSolution";
+        outputControl   timeStep;
+        outputInterval  1;
+        fileToUpdate    "$FOAM_CASE/system/fvSolution";
+
         timeVsFile
         (
-            (-1 "$FOAM_CASE/system/fvSolution.0")
-            (0.10 "$FOAM_CASE/system/fvSolution.10")
-            (0.20 "$FOAM_CASE/system/fvSolution.20")
-            (0.35 "$FOAM_CASE/system/fvSolution.35")
+            ( -1   "$FOAM_CASE/system/fvSolution.0"  )
+            ( 0.10 "$FOAM_CASE/system/fvSolution.10" )
+            ( 0.20 "$FOAM_CASE/system/fvSolution.20" )
+            ( 0.35 "$FOAM_CASE/system/fvSolution.35" )
         );
     }
 }
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 838b15b176..c7d7b5006f 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(timeActivatedFileUpdate, 0);
-}
+defineTypeNameAndDebug(Foam::timeActivatedFileUpdate, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/randomProcesses/noise/noiseFFT.C b/src/randomProcesses/noise/noiseFFT.C
index 687994868b..a68a88d457 100644
--- a/src/randomProcesses/noise/noiseFFT.C
+++ b/src/randomProcesses/noise/noiseFFT.C
@@ -111,7 +111,7 @@ Foam::noiseFFT::noiseFFT(const fileName& pFileName, const label skip)
 Foam::graph Foam::noiseFFT::pt() const
 {
     scalarField t(size());
-    forAll (t, i)
+    forAll(t, i)
     {
         t[i] = i*deltat_;
     }
@@ -150,7 +150,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 
     label offset = ni*windowOffset;
 
-    forAll (pw, i)
+    forAll(pw, i)
     {
         pw[i] = operator[](i + offset);
     }
@@ -162,7 +162,7 @@ Foam::tmp<Foam::scalarField> Foam::noiseFFT::window
 Foam::tmp<Foam::scalarField> Foam::noiseFFT::Hanning(const label N) const
 {
     scalarField t(N);
-    forAll (t, i)
+    forAll(t, i)
     {
         t[i] = i*deltat_;
     }
@@ -238,7 +238,7 @@ Foam::graph Foam::noiseFFT::meanPf
     scalarField f(MeanPf.size());
     scalar deltaf = 1.0/(N*deltat_);
 
-    forAll (f, i)
+    forAll(f, i)
     {
         f[i] = i*deltaf;
     }
@@ -284,7 +284,7 @@ Foam::graph Foam::noiseFFT::RMSmeanPf
     scalarField f(RMSMeanPf.size());
     scalar deltaf = 1.0/(N*deltat_);
 
-    forAll (f, i)
+    forAll(f, i)
     {
         f[i] = i*deltaf;
     }
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 4f1a29ed82..cfdbc52681 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -71,12 +71,12 @@ void Foam::meshToMesh::calcAddressing()
     // set reference to boundary
     const polyPatchList& patchesFrom = fromMesh_.boundaryMesh();
 
-    forAll (patchesFrom, patchI)
+    forAll(patchesFrom, patchI)
     {
         // get reference to cells next to the boundary
         const unallocLabelList& bCells = patchesFrom[patchI].faceCells();
 
-        forAll (bCells, faceI)
+        forAll(bCells, faceI)
         {
             boundaryCell[bCells[faceI]] = true;
         }
@@ -126,7 +126,7 @@ void Foam::meshToMesh::calcAddressing()
         oc
     );
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         const polyPatch& toPatch = toMesh_.boundaryMesh()[patchi];
 
@@ -243,7 +243,7 @@ void Foam::meshToMesh::cellAddresses
     const vectorField& centresFrom = fromMesh.cellCentres();
     const labelListList& cc = fromMesh.cellCells();
 
-    forAll (points, toI)
+    forAll(points, toI)
     {
         // pick up target position
         const vector& p = points[toI];
@@ -260,7 +260,7 @@ void Foam::meshToMesh::cellAddresses
             // set the current list of neighbouring cells
             const labelList& neighbours = cc[curCell];
 
-            forAll (neighbours, nI)
+            forAll(neighbours, nI)
             {
                 scalar curDistSqr =
                     magSqr(p - centresFrom[neighbours[nI]]);
@@ -300,7 +300,7 @@ void Foam::meshToMesh::cellAddresses
                 // set the current list of neighbouring cells
                 const labelList& neighbours = cc[curCell];
 
-                forAll (neighbours, nI)
+                forAll(neighbours, nI)
                 {
                     // search through all the neighbours.
                     // If point is in neighbour reset current cell
@@ -319,12 +319,12 @@ void Foam::meshToMesh::cellAddresses
                     // set the current list of neighbouring cells
                     const labelList& neighbours = cc[curCell];
 
-                    forAll (neighbours, nI)
+                    forAll(neighbours, nI)
                     {
                         // set the current list of neighbour-neighbouring cells
                         const labelList& nn = cc[neighbours[nI]];
 
-                        forAll (nn, nI)
+                        forAll(nn, nI)
                         {
                             // search through all the neighbours.
                             // If point is in neighbour reset current cell
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index efbd09ad77..9a942408c0 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -50,7 +50,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
     const vectorField& centreFrom = fromMesh_.C().internalField();
     const vectorField& centreTo = toMesh_.C().internalField();
 
-    forAll (cellAddressing_, celli)
+    forAll(cellAddressing_, celli)
     {
         if (cellAddressing_[celli] != -1)
         {
@@ -81,7 +81,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
                 scalar sumInvDist = invDist;
 
                 // now add the neighbours
-                forAll (neighbours, ni)
+                forAll(neighbours, ni)
                 {
                     invDist = 1.0/mag(target - centreFrom[neighbours[ni]]);
                     invDistCoeffs[celli][ni + 1] = invDist;
@@ -89,7 +89,7 @@ void Foam::meshToMesh::calculateInverseDistanceWeights() const
                 }
 
                 // divide by the total inverse-distance
-                forAll (invDistCoeffs[celli], i)
+                forAll(invDistCoeffs[celli], i)
                 {
                     invDistCoeffs[celli][i] /= sumInvDist;
                 }
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index 2b7a021bd2..e341fef90b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -50,7 +50,7 @@ Foam::meshToMesh::meshToMesh
     boundaryAddressing_(toMesh_.boundaryMesh().size()),
     inverseDistanceWeightsPtr_(NULL)
 {
-    forAll (fromMesh_.boundaryMesh(), patchi)
+    forAll(fromMesh_.boundaryMesh(), patchi)
     {
         fromMeshPatches_.insert
         (
@@ -59,7 +59,7 @@ Foam::meshToMesh::meshToMesh
         );
     }
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         toMeshPatches_.insert
         (
@@ -68,7 +68,7 @@ Foam::meshToMesh::meshToMesh
         );
     }
 
-    forAll (cuttingPatchNames, i)
+    forAll(cuttingPatchNames, i)
     {
         if (toMeshPatches_.found(cuttingPatchNames[i]))
         {
@@ -91,7 +91,7 @@ Foam::meshToMesh::meshToMesh
         }
     }
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         // Add the processor patches in the toMesh to the cuttingPatches list
         if (isA<processorPolyPatch>(toMesh_.boundaryMesh()[patchi]))
@@ -134,7 +134,7 @@ Foam::meshToMesh::meshToMesh
             << exit(FatalError);
     }
 
-    forAll (fromMesh_.boundaryMesh(), patchi)
+    forAll(fromMesh_.boundaryMesh(), patchi)
     {
         if
         (
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
index ac083437cc..9398821b2a 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.H
@@ -150,9 +150,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~meshToMesh();
+    //- Destructor
+    ~meshToMesh();
 
 
     //- Patch-field interpolation class
@@ -173,10 +172,9 @@ public:
             {}
 
 
-        // Destructor
-
-            virtual ~patchFieldInterpolator()
-            {}
+        //- Destructor
+        virtual ~patchFieldInterpolator()
+        {}
 
 
         // Member Functions
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
index 796afdbc7c..bcaec6d0ff 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMeshInterpolate.C
@@ -67,7 +67,7 @@ void Foam::meshToMesh::interpolateField
     // get reference to cellCells
     const labelListList& cc = fromMesh_.cellCells();
 
-    forAll (toF, celli)
+    forAll(toF, celli)
     {
         if (adr[celli] != -1)
         {
@@ -97,7 +97,7 @@ void Foam::meshToMesh::interpolateField
     // Cell-Point interpolation
     interpolationCellPoint<Type> interpolator(fromVf);
 
-    forAll (toF, celli)
+    forAll(toF, celli)
     {
         if (adr[celli] != -1)
         {
@@ -206,7 +206,7 @@ void Foam::meshToMesh::interpolate
 {
     interpolateInternalField(toVf, fromVf, ord);
 
-    forAll (toMesh_.boundaryMesh(), patchi)
+    forAll(toMesh_.boundaryMesh(), patchi)
     {
         const fvPatch& toPatch = toMesh_.boundary()[patchi];
 
@@ -338,7 +338,7 @@ Foam::meshToMesh::interpolate
         boundaryAddressing_.size()
     );
 
-    forAll (boundaryAddressing_, patchI)
+    forAll(boundaryAddressing_, patchI)
     {
         patchFields.set
         (
diff --git a/src/sampling/sampledSet/cloud/cloudSet.H b/src/sampling/sampledSet/cloud/cloudSet.H
index dfe2732f98..40c451d1c1 100644
--- a/src/sampling/sampledSet/cloud/cloudSet.H
+++ b/src/sampling/sampledSet/cloud/cloudSet.H
@@ -104,7 +104,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~cloudSet();
 };
 
diff --git a/src/sampling/sampledSet/face/faceOnlySet.H b/src/sampling/sampledSet/face/faceOnlySet.H
index bdb1e240dc..c02eecb55b 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.H
+++ b/src/sampling/sampledSet/face/faceOnlySet.H
@@ -121,7 +121,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~faceOnlySet();
 
 
diff --git a/src/sampling/sampledSet/midPoint/midPointSet.H b/src/sampling/sampledSet/midPoint/midPointSet.H
index 2fff452e12..1092b494bf 100644
--- a/src/sampling/sampledSet/midPoint/midPointSet.H
+++ b/src/sampling/sampledSet/midPoint/midPointSet.H
@@ -88,7 +88,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~midPointSet();
 };
 
diff --git a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
index ddf84a58dc..993418d02b 100644
--- a/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
+++ b/src/sampling/sampledSet/midPointAndFace/midPointAndFaceSet.H
@@ -89,7 +89,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~midPointAndFaceSet();
 };
 
diff --git a/src/sampling/sampledSet/polyLine/polyLineSet.H b/src/sampling/sampledSet/polyLine/polyLineSet.H
index 91e3478ab7..ae5250b705 100644
--- a/src/sampling/sampledSet/polyLine/polyLineSet.H
+++ b/src/sampling/sampledSet/polyLine/polyLineSet.H
@@ -119,7 +119,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~polyLineSet();
 };
 
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index da77332359..b1671054c2 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -237,7 +237,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~sampledSet();
 
 
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index ce180900e7..95fd360726 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -267,7 +267,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~sampledSets();
 
 
diff --git a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
index f9396fe8bf..4077542750 100644
--- a/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
+++ b/src/sampling/sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.H
@@ -95,7 +95,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~triSurfaceMeshPointSet();
 
 
diff --git a/src/sampling/sampledSet/uniform/uniformSet.H b/src/sampling/sampledSet/uniform/uniformSet.H
index f7489b46a3..9c0fab3335 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.H
+++ b/src/sampling/sampledSet/uniform/uniformSet.H
@@ -138,7 +138,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~uniformSet();
 };
 
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 53eb48c852..966496f089 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -126,9 +126,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~distanceSurface();
+    //- Destructor
+    virtual ~distanceSurface();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index f3c801faf6..405065906f 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -36,10 +36,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(isoSurface, 0);
-}
+defineTypeNameAndDebug(Foam::isoSurface, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index 177c42253f..822c668f8f 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -34,10 +34,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(isoSurfaceCell, 0);
-}
+defineTypeNameAndDebug(Foam::isoSurfaceCell, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index 1d4ed888d5..a6d5a85d46 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -151,9 +151,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledIsoSurface();
+    //- Destructor
+    virtual ~sampledIsoSurface();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index 43b25641ee..3f57adc6df 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -120,9 +120,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledIsoSurfaceCell();
+    //- Destructor
+    virtual ~sampledIsoSurfaceCell();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index 7e4bd9988e..9ca4a2d057 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -131,9 +131,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledCuttingPlane();
+    //- Destructor
+    virtual ~sampledCuttingPlane();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index f0cb3e08bf..e14f30ec76 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -114,9 +114,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledPatch();
+    //- Destructor
+    virtual ~sampledPatch();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index 22cdeb804f..b5dc66508e 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -101,9 +101,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledPlane();
+    //- Destructor
+    virtual ~sampledPlane();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
index 2bf14500ed..511cc758c1 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.H
@@ -222,9 +222,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledSurface();
+    //- Destructor
+    virtual ~sampledSurface();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index eb3d379535..e711b64d6c 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -224,9 +224,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledSurfaces();
+    //- Destructor
+    virtual ~sampledSurfaces();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 0bdbf75b0c..5ea423583d 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -118,9 +118,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledTriSurfaceMesh();
+    //- Destructor
+    virtual ~sampledTriSurfaceMesh();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
index 056b912659..247a78c101 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
@@ -118,9 +118,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~sampledThresholdCellFaces();
+    //- Destructor
+    virtual ~sampledThresholdCellFaces();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
index 10d73603d8..5102cd1bb6 100644
--- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H
@@ -71,9 +71,8 @@ public:
         dxSurfaceWriter();
 
 
-    // Destructor
-
-        virtual ~dxSurfaceWriter();
+    //- Destructor
+    virtual ~dxSurfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
index 9e7f46419b..383f3515cd 100644
--- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H
@@ -64,9 +64,8 @@ public:
         foamFileSurfaceWriter();
 
 
-    // Destructor
-
-        virtual ~foamFileSurfaceWriter();
+    //- Destructor
+    virtual ~foamFileSurfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
index a71ae7b6f2..a513bf1783 100644
--- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H
@@ -63,9 +63,8 @@ public:
         nullSurfaceWriter();
 
 
-    // Destructor
-
-        virtual ~nullSurfaceWriter();
+    //- Destructor
+    virtual ~nullSurfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
index 5c7145e91f..5ccf5ea92f 100644
--- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H
@@ -68,9 +68,8 @@ public:
         proxySurfaceWriter(const word& ext);
 
 
-    // Destructor
-
-        virtual ~proxySurfaceWriter();
+    //- Destructor
+    virtual ~proxySurfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index ec2ca54a9b..51fb5ecb9b 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -125,9 +125,8 @@ public:
         rawSurfaceWriter();
 
 
-    // Destructor
-
-        virtual ~rawSurfaceWriter();
+    //- Destructor
+    virtual ~rawSurfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H
index 9420b178df..89a8a444fb 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.H
@@ -93,9 +93,8 @@ public:
         surfaceWriter();
 
 
-    // Destructor
-
-        virtual ~surfaceWriter();
+    //- Destructor
+    virtual ~surfaceWriter();
 
 
     // Member Functions
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
index b228f741f8..431d952cfa 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
@@ -69,9 +69,8 @@ public:
         vtkSurfaceWriter();
 
 
-    // Destructor
-
-        virtual ~vtkSurfaceWriter();
+    //- Destructor
+    virtual ~vtkSurfaceWriter();
 
 
     // Member Functions
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 3210a9bf40..3fb18124b2 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -260,9 +260,8 @@ public:
         static autoPtr<MeshedSurface> New(const fileName&);
 
 
-    // Destructor
-
-        virtual ~MeshedSurface();
+    //- Destructor
+    virtual ~MeshedSurface();
 
 
     // Member Function Selectors
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 432eed95cd..1d3f48dfa3 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -102,9 +102,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~MeshedSurfaceProxy();
+    //- Destructor
+    virtual ~MeshedSurfaceProxy();
 
 
     // Member Function Selectors
diff --git a/src/surfMesh/surfMesh/surfMesh.H b/src/surfMesh/surfMesh/surfMesh.H
index 3275ea4b1d..14496ca781 100644
--- a/src/surfMesh/surfMesh/surfMesh.H
+++ b/src/surfMesh/surfMesh/surfMesh.H
@@ -176,9 +176,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~surfMesh();
+    //- Destructor
+    virtual ~surfMesh();
 
 
     // Member Functions
diff --git a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
index eccf8280b0..8a014add6e 100644
--- a/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
+++ b/src/surfMesh/surfZone/surfZone/surfZoneIOList.H
@@ -83,9 +83,8 @@ public:
         surfZoneIOList(const IOobject&, const Xfer<surfZoneList>&);
 
 
-    // Destructor
-
-        ~surfZoneIOList();
+    //- Destructor
+    ~surfZoneIOList();
 
 
     // Member Functions
diff --git a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
index 7c7ccd372c..c914164ccc 100644
--- a/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
+++ b/src/surfMesh/surfZone/surfZoneIdentifier/surfZoneIdentifier.H
@@ -104,9 +104,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~surfZoneIdentifier();
+    //- Destructor
+    virtual ~surfZoneIdentifier();
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
index e17eb4b265..c74fd5060f 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.H
@@ -93,10 +93,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~AC3DsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~AC3DsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
index ddd131b974..c536ff8b6f 100644
--- a/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ftr/FTRsurfaceFormat.H
@@ -114,10 +114,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~FTRsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~FTRsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
index 464b4d9e5f..e29263031b 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.H
@@ -94,10 +94,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~NASsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~NASsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
index df315e2b24..87fdf9a2eb 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.H
@@ -86,10 +86,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~OBJsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~OBJsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
index 1a272123ee..f77e491aec 100644
--- a/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H
@@ -91,10 +91,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~OFSsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~OFSsurfaceFormat()
+    {}
 
 
 
diff --git a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
index 45890d08b2..f8b3fdb36a 100644
--- a/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/smesh/SMESHsurfaceFormat.H
@@ -78,10 +78,9 @@ public:
         SMESHsurfaceFormat();
 
 
-    // Destructor
-
-        virtual ~SMESHsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~SMESHsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 246fdb87aa..1ace377235 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -109,9 +109,8 @@ public:
         STLsurfaceFormatCore(const fileName&);
 
 
-    // Destructor
-
-        ~STLsurfaceFormatCore();
+    //- Destructor
+    ~STLsurfaceFormatCore();
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
index 81e76aa2cf..dd773054dc 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.H
@@ -116,9 +116,8 @@ public:
         surfaceFormatsCore();
 
 
-    // Destructor
-
-        virtual ~surfaceFormatsCore();
+    //- Destructor
+    virtual ~surfaceFormatsCore();
 };
 
 
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
index 728e9e1dae..44632da622 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.H
@@ -90,9 +90,8 @@ public:
         TRIsurfaceFormatCore(const fileName&);
 
 
-    // Destructor
-
-        ~TRIsurfaceFormatCore();
+    //- Destructor
+    ~TRIsurfaceFormatCore();
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
index aba403ae14..3e88ddcdff 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.H
@@ -78,10 +78,9 @@ public:
         VTKsurfaceFormat();
 
 
-    // Destructor
-
-        virtual ~VTKsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~VTKsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
index 28ec213c6a..c43d050ad9 100644
--- a/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/wrl/WRLsurfaceFormat.H
@@ -74,10 +74,9 @@ public:
         WRLsurfaceFormat();
 
 
-    // Destructor
-
-        virtual ~WRLsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~WRLsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
index a8387f0e34..0dae045cc1 100644
--- a/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
+++ b/src/surfMesh/surfaceFormats/x3d/X3DsurfaceFormat.H
@@ -73,10 +73,9 @@ public:
         X3DsurfaceFormat();
 
 
-    // Destructor
-
-        virtual ~X3DsurfaceFormat()
-        {}
+    //- Destructor
+    virtual ~X3DsurfaceFormat()
+    {}
 
 
     // Member Functions
diff --git a/src/surfMesh/surfaceRegistry/surfaceRegistry.H b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
index 768edd4fa9..04b5c7b6d8 100644
--- a/src/surfMesh/surfaceRegistry/surfaceRegistry.H
+++ b/src/surfMesh/surfaceRegistry/surfaceRegistry.H
@@ -78,9 +78,8 @@ public:
         surfaceRegistry(const objectRegistry&, const word& surfName = "");
 
 
-    // Destructor
-
-        virtual ~surfaceRegistry();
+    //- Destructor
+    virtual ~surfaceRegistry();
 };
 
 
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
index d199928dbe..da9f767b11 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Chung/Chung.H
@@ -79,10 +79,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~Chung()
-        {}
+    //- Destructor
+    ~Chung()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
index 2d733fb652..6c78260e63 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Wallis/Wallis.H
@@ -79,10 +79,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~Wallis()
-        {}
+    //- Destructor
+    ~Wallis()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
index e6615bb777..017c71fd45 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/barotropicCompressibilityModel/barotropicCompressibilityModel.H
@@ -125,10 +125,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~barotropicCompressibilityModel()
-        {}
+    //- Destructor
+    virtual ~barotropicCompressibilityModel()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
index 7f8f021000..989bb384bd 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/linear/linear.H
@@ -76,10 +76,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~linear()
-        {}
+    //- Destructor
+    ~linear()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/pdfs/general/general.H b/src/thermophysicalModels/pdfs/general/general.H
index c641ea0f66..5c178443a6 100644
--- a/src/thermophysicalModels/pdfs/general/general.H
+++ b/src/thermophysicalModels/pdfs/general/general.H
@@ -83,7 +83,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~general();
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
index 25ccb5a6dc..5300d3718c 100644
--- a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
+++ b/src/thermophysicalModels/radiation/radiationModel/P1/P1.H
@@ -94,7 +94,7 @@ public:
         P1(const volScalarField& T);
 
 
-    // Destructor
+    //- Destructor
     virtual ~P1();
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
index 10756e4c7e..9bb61b361b 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H
@@ -98,7 +98,7 @@ public:
         {}
 
 
-    // Destructor
+    //- Destructor
     ~absorptionCoeffs();
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
index bed89bdab2..732631fd4e 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H
@@ -99,7 +99,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     ~blackBodyEmission();
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index f73d12199f..effd9cd635 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -253,7 +253,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
 
     Info<< "fvDOM : Allocated " << IRay_.size()
         << " rays with average orientation:" << nl;
-    forAll (IRay_, i)
+    forAll(IRay_, i)
     {
         Info<< '\t' << IRay_[i].I().name()
             << '\t' << IRay_[i].dAve() << nl;
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
index 9182d6d161..15c57772b8 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
@@ -134,7 +134,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     ~radiativeIntensityRay();
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
index 397aa49f61..7f36a0cd09 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H
@@ -80,7 +80,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~binaryAbsorptionEmission();
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
index 64bfaf9707..e33afebba3 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H
@@ -84,7 +84,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~constantAbsorptionEmission();
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
index 7bfb051cc6..7b7c2a4680 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H
@@ -159,7 +159,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~greyMeanAbsorptionEmission();
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
index cc10e10f84..7b3373ed83 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H
@@ -69,7 +69,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~noAbsorptionEmission();
 };
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
index 8df317aa6f..d71842feee 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H
@@ -189,7 +189,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~wideBandAbsorptionEmission();
 
 
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
index 2919c285ef..336d9e1955 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H
@@ -85,9 +85,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~constantScatter();
+    //- Destructor
+    ~constantScatter();
 
 
     // Member Operators
diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
index bb3287c24d..4d97e911bf 100644
--- a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
+++ b/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H
@@ -97,9 +97,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~scatterModel();
+    //- Destructor
+    virtual ~scatterModel();
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 8392069679..6edaa29c2c 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -1428,7 +1428,7 @@ bool finishReaction = false;
 
         bool found = false;
 
-        forAll (lrhs, i)
+        forAll(lrhs, i)
         {
             if (lrhs[i].index == currentSpecieIndex)
             {
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 7a33facf2f..29717a7554 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -111,7 +111,7 @@ Foam::scalar Foam::chemkinReader::molecularWeight
 {
     scalar molWt = 0.0;
 
-    forAll (specieComposition, i)
+    forAll(specieComposition, i)
     {
         label nAtoms = specieComposition[i].nAtoms;
         const word& elementName = specieComposition[i].elementName;
@@ -430,24 +430,24 @@ void Foam::chemkinReader::addReaction
 
     scalarList nAtoms(elementNames_.size(), 0.0);
 
-    forAll (lhs, i)
+    forAll(lhs, i)
     {
         const List<specieElement>& specieComposition =
             specieComposition_[speciesTable_[lhs[i].index]];
 
-        forAll (specieComposition, j)
+        forAll(specieComposition, j)
         {
             label elementi = elementIndices_[specieComposition[j].elementName];
             nAtoms[elementi] += lhs[i].stoichCoeff*specieComposition[j].nAtoms;
         }
     }
 
-    forAll (rhs, i)
+    forAll(rhs, i)
     {
         const List<specieElement>& specieComposition =
             specieComposition_[speciesTable_[rhs[i].index]];
 
-        forAll (specieComposition, j)
+        forAll(specieComposition, j)
         {
             label elementi = elementIndices_[specieComposition[j].elementName];
             nAtoms[elementi] -= rhs[i].stoichCoeff*specieComposition[j].nAtoms;
@@ -459,7 +459,7 @@ void Foam::chemkinReader::addReaction
     // for the change from mol/cm^3 to kmol/m^3 concentraction units
     const scalar concFactor = 0.001;
     scalar sumExp = 0.0;
-    forAll (lhs, i)
+    forAll(lhs, i)
     {
         sumExp += lhs[i].exponent;
     }
@@ -470,7 +470,7 @@ void Foam::chemkinReader::addReaction
     if (rType == nonEquilibriumReversible)
     {
         sumExp = 0.0;
-        forAll (rhs, i)
+        forAll(rhs, i)
         {
             sumExp += rhs[i].exponent;
         }
@@ -770,7 +770,7 @@ void Foam::chemkinReader::addReaction
     }
 
 
-    forAll (nAtoms, i)
+    forAll(nAtoms, i)
     {
         if (mag(nAtoms[i]) > SMALL)
         {
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index a82f01f9e2..2390626594 100644
--- a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -325,10 +325,9 @@ public:
         chemkinReader(const dictionary& thermoDict);
 
 
-    // Destructor
-
-        virtual ~chemkinReader()
-        {}
+    //- Destructor
+    virtual ~chemkinReader()
+    {}
 
 
     // Member functions
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 16fff678b7..617349840c 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -56,7 +56,7 @@ void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
         Yt += Y_[n];
     }
 
-    forAll (Y_, n)
+    forAll(Y_, n)
     {
         Y_[n] /= Yt;
     }
diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H
index a6e4aabae8..189feba08b 100644
--- a/src/thermophysicalModels/solids/solid/solid.H
+++ b/src/thermophysicalModels/solids/solid/solid.H
@@ -124,10 +124,9 @@ public:
         static autoPtr<solid> New(Istream& is);
 
 
-    // Destructor
-
-        virtual ~solid()
-        {}
+    //- Destructor
+    virtual ~solid()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
index 0a4fa8ef5d..4ff1606858 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/IrreversibleReaction/IrreversibleReaction.H
@@ -122,10 +122,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~IrreversibleReaction()
-        {}
+    //- Destructor
+    virtual ~IrreversibleReaction()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
index accf946523..983bdfff2c 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/NonEquilibriumReversibleReaction/NonEquilibriumReversibleReaction.H
@@ -125,10 +125,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~NonEquilibriumReversibleReaction()
-        {}
+    //- Destructor
+    virtual ~NonEquilibriumReversibleReaction()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
index 04416ee743..a42b8c90c0 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
@@ -238,10 +238,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~Reaction()
-        {}
+    //- Destructor
+    virtual ~Reaction()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
index bd8891328c..1c3672f04f 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/ReversibleReaction/ReversibleReaction.H
@@ -119,10 +119,9 @@ public:
         }
 
 
-    // Destructor
-
-        virtual ~ReversibleReaction()
-        {}
+    //- Destructor
+    virtual ~ReversibleReaction()
+    {}
 
 
     // Member Functions
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index 04a1b80139..1246fc4b36 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -116,7 +116,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
 inline Foam::scalar Foam::thirdBodyEfficiencies::M(const scalarList& c) const
 {
     scalar M = 0.0;
-    forAll (*this, i)
+    forAll(*this, i)
     {
         M += operator[](i)*c[i];
     }
@@ -169,7 +169,7 @@ inline Foam::Ostream& Foam::operator<<
 
     os << token::BEGIN_LIST << valMaxCount;
 
-    forAll (tbes, i)
+    forAll(tbes, i)
     {
         if (notEqual(tbes[i], valMaxCount))
         {
diff --git a/src/thermophysicalModels/specie/speciesTable/speciesTable.C b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
index ec00f0be73..ed2929088d 100644
--- a/src/thermophysicalModels/specie/speciesTable/speciesTable.C
+++ b/src/thermophysicalModels/specie/speciesTable/speciesTable.C
@@ -29,7 +29,7 @@ License
 
 void Foam::speciesTable::setIndices()
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         specieIndices_.insert(wordList::operator[](i), i);
     }
@@ -52,7 +52,7 @@ Foam::speciesTable::speciesTable(const label nSpecies, const char** specieNames)
 :
     wordList(nSpecies)
 {
-    forAll (*this, i)
+    forAll(*this, i)
     {
         wordList::operator[](i) = specieNames[i];
     }
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 3afdab2157..08fecc77a0 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -89,7 +89,7 @@ void Foam::thermalPorousZone::addEnthalpySource
     scalarField hZone = thermo.h(scalarField(cells.size(), T_.value()), cells);
     scalar rate = 1e6;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         hDiag[cells[i]] += rate*V[cells[i]]*rho[cells[i]];
         hSource[cells[i]] += rate*V[cells[i]]*rho[cells[i]]*hZone[i];
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
index 04e29059e2..261abb18e9 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZoneTemplates.C
@@ -41,7 +41,7 @@ void Foam::porousZone::addPowerLawResistance
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         Udiag[cells[i]] +=
             V[cells[i]]*rho[cells[i]]*C0*pow(magSqr(U[cells[i]]), C1m1b2);
@@ -64,7 +64,7 @@ void Foam::porousZone::addViscousInertialResistance
     const tensor& D = D_.value();
     const tensor& F = F_.value();
 
-    forAll (cells, i)
+    forAll(cells, i)
     {
         tensor dragCoeff = mu[cells[i]]*D + (rho[cells[i]]*mag(U[cells[i]]))*F;
         scalar isoDragCoeff = tr(dragCoeff);
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 8243b56003..3baf8c52e3 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -78,10 +78,9 @@ public:
         static autoPtr<thermophysicalFunction> New(Istream& is);
 
 
-    // Destructor
-
-        virtual ~thermophysicalFunction()
-        {}
+    //- Destructor
+    virtual ~thermophysicalFunction()
+    {}
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 3f5e8eab7c..ac416f50da 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -89,7 +89,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -110,7 +110,7 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -172,7 +172,7 @@ void Foam::linearValveFvMesh::makeSlidersDead()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable layering
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -194,7 +194,7 @@ void Foam::linearValveFvMesh::makeSlidersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable sliding interface
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -217,7 +217,7 @@ bool Foam::linearValveFvMesh::attached() const
 
     bool result = false;
 
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -228,7 +228,7 @@ bool Foam::linearValveFvMesh::attached() const
     }
 
     // Check thal all sliders are in sync (debug only)
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
index 1ae1084767..2aca2ca655 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.H
@@ -94,9 +94,8 @@ public:
         explicit linearValveFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~linearValveFvMesh();
+    //- Destructor
+    virtual ~linearValveFvMesh();
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 61395460c9..9723dcb320 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -92,7 +92,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -113,7 +113,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -148,7 +148,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     labelList lpf(layerPatch.size());
 
-    forAll (lpf, i)
+    forAll(lpf, i)
     {
         lpf[i] = layerPatch.start() + i;
     }
@@ -216,7 +216,7 @@ void Foam::linearValveLayersFvMesh::makeLayersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable layering
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
@@ -242,7 +242,7 @@ void Foam::linearValveLayersFvMesh::makeSlidersLive()
     const polyTopoChanger& topoChanges = topoChanger_;
 
     // Enable sliding interface
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
@@ -269,7 +269,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
 
     bool result = false;
 
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -280,7 +280,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
     }
 
     // Check thal all sliders are in sync (debug only)
-    forAll (topoChanges, modI)
+    forAll(topoChanges, modI)
     {
         if (isA<slidingInterface>(topoChanges[modI]))
         {
@@ -327,7 +327,7 @@ Foam::tmp<Foam::pointField> Foam::linearValveLayersFvMesh::newPoints() const
         motionDict_.lookup("pistonVelocity")
     );
 
-    forAll (patchPoints, ppI)
+    forAll(patchPoints, ppI)
     {
         np[patchPoints[ppI]] += vel*time().deltaTValue();
     }
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
index d570f90231..17b7618e3d 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.H
@@ -94,9 +94,8 @@ public:
         explicit linearValveLayersFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~linearValveLayersFvMesh();
+    //- Destructor
+    virtual ~linearValveLayersFvMesh();
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index b0f515aaec..693e080bd6 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -89,7 +89,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     labelList isf(innerSlider.size());
 
-    forAll (isf, i)
+    forAll(isf, i)
     {
         isf[i] = innerSlider.start() + i;
     }
@@ -110,7 +110,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     labelList osf(outerSlider.size());
 
-    forAll (osf, i)
+    forAll(osf, i)
     {
         osf[i] = outerSlider.start() + i;
     }
@@ -220,16 +220,16 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& cellAddr =
         cellZones()[cellZones().findZoneID("movingCells")];
 
-    forAll (cellAddr, cellI)
+    forAll(cellAddr, cellI)
     {
         const cell& curCell = c[cellAddr[cellI]];
 
-        forAll (curCell, faceI)
+        forAll(curCell, faceI)
         {
             // Mark all the points as moving
             const face& curFace = f[curCell[faceI]];
 
-            forAll (curFace, pointI)
+            forAll(curFace, pointI)
             {
                 movingPointsMask[curFace[pointI]] = 1;
             }
@@ -245,11 +245,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& innerSliderAddr =
         faceZones()[faceZones().findZoneID(innerSliderZoneName)];
 
-    forAll (innerSliderAddr, faceI)
+    forAll(innerSliderAddr, faceI)
     {
         const face& curFace = f[innerSliderAddr[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             movingPointsMask[curFace[pointI]] = 1;
         }
@@ -264,11 +264,11 @@ void Foam::mixerFvMesh::calcMovingMasks() const
     const labelList& outerSliderAddr =
         faceZones()[faceZones().findZoneID(outerSliderZoneName)];
 
-    forAll (outerSliderAddr, faceI)
+    forAll(outerSliderAddr, faceI)
     {
         const face& curFace = f[outerSliderAddr[faceI]];
 
-        forAll (curFace, pointI)
+        forAll(curFace, pointI)
         {
             movingPointsMask[curFace[pointI]] = 0;
         }
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index 951af279c9..3eecccd303 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -99,9 +99,8 @@ public:
         explicit mixerFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~mixerFvMesh();
+    //- Destructor
+    virtual ~mixerFvMesh();
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 87f106c59a..497c1ec805 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -61,7 +61,7 @@ Foam::tmp<Foam::scalarField> Foam::movingConeTopoFvMesh::vertexMarkup
     tmp<scalarField> tvertexMarkup(new scalarField(p.size()));
     scalarField& vertexMarkup = tvertexMarkup();
 
-    forAll (p, pI)
+    forAll(p, pI)
     {
         if (p[pI].x() < curLeft - SMALL)
         {
@@ -114,7 +114,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
     boolList flipZone2(fc.size(), false);
     label nZoneFaces2 = 0;
 
-    forAll (fc, faceI)
+    forAll(fc, faceI)
     {
         if
         (
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
index 0d3c4a2c41..88fca0b5d3 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.H
@@ -114,9 +114,8 @@ public:
         explicit movingConeTopoFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~movingConeTopoFvMesh();
+    //- Destructor
+    virtual ~movingConeTopoFvMesh();
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
index f771a04954..8fc09a4463 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.H
@@ -87,9 +87,8 @@ public:
         //- Construct from database
         explicit rawTopoChangerFvMesh(const IOobject& io);
 
-    // Destructor
-
-        virtual ~rawTopoChangerFvMesh();
+    //- Destructor
+    virtual ~rawTopoChangerFvMesh();
 
 
     // Member Functions
diff --git a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
index 5c7a8f0cbc..fb419bef59 100644
--- a/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
+++ b/src/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMesh.H
@@ -80,9 +80,8 @@ public:
         explicit topoChangerFvMesh(const IOobject& io);
 
 
-    // Destructor
-
-        virtual ~topoChangerFvMesh();
+    //- Destructor
+    virtual ~topoChangerFvMesh();
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
index 95e936f71a..1dbec9cbca 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
@@ -93,10 +93,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~twoPhaseMixture()
-        {}
+    //- Destructor
+    ~twoPhaseMixture()
+    {}
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
index a4ffd78bc2..238c39d020 100644
--- a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
+++ b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H
@@ -82,9 +82,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~singlePhaseTransportModel();
+    //- Destructor
+    virtual ~singlePhaseTransportModel();
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/transportModel/transportModel.H b/src/transportModels/incompressible/transportModel/transportModel.H
index 92d101b393..3c2e220aa1 100644
--- a/src/transportModels/incompressible/transportModel/transportModel.H
+++ b/src/transportModels/incompressible/transportModel/transportModel.H
@@ -74,9 +74,8 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~transportModel();
+    //- Destructor
+    virtual ~transportModel();
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
index b5a486defb..514868fa73 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.H
@@ -90,10 +90,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~BirdCarreau()
-        {}
+    //- Destructor
+    ~BirdCarreau()
+    {}
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
index e49b3bdd70..34b189ef3d 100644
--- a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
+++ b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.H
@@ -89,10 +89,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~CrossPowerLaw()
-        {}
+    //- Destructor
+    ~CrossPowerLaw()
+    {}
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
index 86fdd15b2f..7ba0c5112c 100644
--- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
+++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.H
@@ -90,10 +90,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~HerschelBulkley()
-        {}
+    //- Destructor
+    ~HerschelBulkley()
+    {}
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
index dee612d470..e68d8c9119 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.H
@@ -79,10 +79,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~Newtonian()
-        {}
+    //- Destructor
+    ~Newtonian()
+    {}
 
 
     // Member Functions
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
index dc90eda336..b9810b0e60 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.H
@@ -90,10 +90,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~powerLaw()
-        {}
+    //- Destructor
+    ~powerLaw()
+    {}
 
 
     // Member Functions
diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
index c263a1994e..dd3d087f9c 100644
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
@@ -173,12 +173,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
     }
     else
     {
-        for
-        (
-            HashTable<label>::const_iterator iter = groupToPatch.begin();
-            iter != groupToPatch.end();
-            ++iter
-        )
+        forAllConstIter(HashTable<label>, groupToPatch, iter)
         {
             patches[iter()] = geometricSurfacePatch
             (
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index a944f31be9..ebb1cffe9d 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -37,14 +37,9 @@ Description
 #include "readHexLabel.H"
 #include "stringList.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool triSurface::readTRI(const fileName& TRIfileName)
+bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 {
     IFstream TRIfile(TRIfileName);
 
@@ -113,12 +108,12 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 
         label region  = -1;
 
-        HashTable<label, string>::const_iterator findName =
+        HashTable<label, string>::const_iterator fnd =
             STLsolidNames.find(solidName);
 
-        if (findName != STLsolidNames.end())
+        if (fnd != STLsolidNames.end())
         {
-            region = findName();
+            region = fnd();
         }
         else
         {
@@ -135,22 +130,17 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 
     pointField rawPoints(STLpoints.size());
 
-    label i = 0;
-    for
-    (
-        SLList<STLpoint>::iterator iter = STLpoints.begin();
-        iter != STLpoints.end();
-        ++iter
-    )
+    label pointI = 0;
+    forAllConstIter(SLList<STLpoint>, STLpoints, iter)
     {
-        rawPoints[i++] = *iter;
+        rawPoints[pointI++] = *iter;
     }
 
     setSize(STLlabels.size());
 
-    label pointI = 0;
-    SLList<label>::iterator iter = STLlabels.begin();
-    forAll (*this, i)
+    pointI = 0;
+    SLList<label>::const_iterator iter = STLlabels.begin();
+    forAll(*this, i)
     {
         operator[](i)[0] = pointI++;
         operator[](i)[1] = pointI++;
@@ -176,8 +166,4 @@ bool triSurface::readTRI(const fileName& TRIfileName)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
index c14ba93d9e..0e892745e4 100644
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H
@@ -86,9 +86,8 @@ public:
         //- Construct from IOobject
         surfacePatchIOList(const IOobject& io, const surfacePatchList&);
 
-    // Destructor
-
-        ~surfacePatchIOList();
+    //- Destructor
+    ~surfacePatchIOList();
 
 
     // Member Functions
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index 5c49cecd7b..32977087ce 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -280,9 +280,8 @@ public:
 
 
 
-    // Destructor
-
-        ~triSurface();
+    //- Destructor
+    ~triSurface();
 
         void clearOut();
 
diff --git a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 2edfe20fe3..6685160e8f 100644
--- a/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -111,7 +111,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~dynOneEqEddy()
     {}
 
diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index 0ce6c3bba9..ac83307700 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -105,7 +105,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~oneEqEddy()
     {}
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
index 599ef1070c..5c23d3d421 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
@@ -77,9 +77,8 @@ public:
         regionProperties(const Time& runTime);
 
 
-    // Destructor
-
-        ~regionProperties();
+    //- Destructor
+    ~regionProperties();
 
 
     // Member Functions
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
index 7ecc332665..305625ce10 100644
--- a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
@@ -85,10 +85,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~IDDESDelta()
-        {}
+    //- Destructor
+    ~IDDESDelta()
+    {}
 
 
     // Member Functions
diff --git a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 0a96a08baf..0ae54425e0 100644
--- a/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -103,10 +103,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~dynMixedSmagorinsky()
-        {}
+    //- Destructor
+    ~dynMixedSmagorinsky()
+    {}
 
 
     // Member Functions
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index a27afc5c61..d7c616d50b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -103,7 +103,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~LienCubicKE()
     {}
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
index d2759d2927..1027e5eec5 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -112,7 +112,7 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
     virtual ~kOmega()
     {}
 
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 8920bfc8a2..36581af575 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -36,11 +36,11 @@ usage()
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: $0 [OPTION]
+usage: ${0##*/} [OPTION]
 
 options:
-  -d            sets up a default scheme on all schemes
-  -h            this usage
+  -default          sets up a default scheme on all schemes
+  -help             print the usage
 
 * quickly tests the tutorials and writes out the scheme/solver information
 
@@ -48,6 +48,30 @@ USAGE
     exit 1
 }
 
+#------------------------------------------------------------------------------
+
+unset DEFAULT_SCHEMES
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -d | -default)
+        DEFAULT_SCHEMES=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
 
 setDefaultFvSchemes()
 {
@@ -98,6 +122,7 @@ done
 
 [ -f "$MAIN_CONTROL_DICT" ] || usage "main controlDict not found"
 
+
 TUTORIALS_DIR=.
 TEST_RUN_DIR=../tutorialsTest
 FV_SCHEMES=\
@@ -113,30 +138,7 @@ SCHEMES_FILE="FvSchemes"
 SCHEMES_TEMP="FvSchemes.temp"
 SOLVERS_FILE="FvSolution"
 SOLVERS_TEMP="FvSolution.temp"
-DEFAULT_SCHEMES=0
 
-#
-# OPTIONS
-#
-OPTS=`getopt hd $*`
-if [ $? -ne 0 ]
-then
-    usage "Aborting due to invalid option"
-fi
-eval set -- "$OPTS"
-while [ $1 != -- ]
-do
-    case $1 in
-    -d)
-        DEFAULT_SCHEMES=1
-        ;;
-    -h)
-        usage
-        ;;
-    esac
-    shift
-done
-shift
 
 #
 # MAIN
@@ -182,7 +184,7 @@ do
     ${CD}.org > ${CD}
 done
 
-if [ $DEFAULT_SCHEMES = 1 ]
+if [ "$DEFAULT_SCHEMES" = true ]
 then
     echo "Modifying the fvSchemes to contain only default schemes"
     for FV_SC in `find . -name fvSchemes`
@@ -209,8 +211,7 @@ do
     echo "$APP: " | tr -d "\n" >> $SOLVERS_FILE
     for ST in $FV_SCHEMES
     do
-        rm $SCHEMES_TEMP > /dev/null 2>&1
-        rm $SOLVERS_TEMP > /dev/null 2>&1
+        rm $SCHEMES_TEMP $SOLVERS_TEMP > /dev/null 2>&1
         echo "  ${ST}" >> $SCHEMES_FILE
         for LOG in `find ${APP} -name "log.${APP}"`
         do
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
index 3ec1280094..529a966486 100644
--- a/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
+++ b/tutorials/DNS/dnsFoam/boxTurb16/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/basic/laplacianFoam/flange/system/controlDict b/tutorials/basic/laplacianFoam/flange/system/controlDict
index cca0701813..8311c5deb6 100644
--- a/tutorials/basic/laplacianFoam/flange/system/controlDict
+++ b/tutorials/basic/laplacianFoam/flange/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict
index 0caf916eca..afa091f846 100644
--- a/tutorials/basic/potentialFoam/cylinder/system/controlDict
+++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
index 0caf916eca..afa091f846 100644
--- a/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/potentialFoam/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
index b406e85ce2..e7eda1d5fc 100644
--- a/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
+++ b/tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 79e443d105..87dbaa3ad3 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 6ab5661f2a..b23a2829ba 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -76,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
index 443097f403..903a8989d7 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
index 43fa1de205..ed8ef41f8b 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -47,7 +47,7 @@ adjustTimeStep  yes;
 
 maxCo           0.1;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
index 8da8d6cb37..295291738f 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
index 8da8d6cb37..295291738f 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.1st
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
index f42bfbc115..34a2d50b06 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
+++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict.2nd
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
index aa179ea085..b2ef1f85d9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/system/controlDict
@@ -36,7 +36,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -44,7 +44,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
index d8eadc979c..82360ae4d7 100644
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
index 041eb98faa..ca419cca9d 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  15;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
index 25ee12e0ac..450818c39c 100755
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/sampleCone
@@ -20,32 +20,34 @@ USAGE
     exit 1
 }
 
+# -----------------------------------------------------------------------------
 
 unset timeOpt
 
-OPTS=`getopt hl $*`
-[ $? -eq 0 ] || usage "Aborting due to invalid option"
-
-eval set -- "$OPTS"
-while [ $1 != -- ]
+# parse options
+while [ "$#" -gt 0 ]
 do
-    case $1 in
-    -l)
-        timeOpt="-latestTime"
-        ;;
-    -h)
+    case "$1" in
+    -h | -help)
         usage
         ;;
+    -l | -latestTime)
+        timeOpt="-latestTime"
+        shift
+        ;;
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
     esac
-    shift
 done
-shift
+
 
 sample $timeOpt
-SDIR="sets"
+SDIR=sets
 LSDIR=`ls $SDIR | head -1`
 EXAMPLE_FILE=`ls -1 $SDIR/${LSDIR}/* | head -1`
 FS=`basename $EXAMPLE_FILE | cut -d_ -f2-`
+
 for d in $SDIR/*
 do
     cat ${d}/cone25_${FS} ${d}/cone55_${FS} ${d}/base_${FS} > ${d}/biconic_${FS}
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index 11ef1e4f4d..99b934db51 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  15;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
index eb4fe54194..d0a8d7d4d2 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
index e4dca7f65f..d31d83f2fa 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 4446eb55c2..f06597be29 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
index 8dc253af75..46c2cd2dd4 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
index 4e53754bf7..cbda6c7e8b 100644
--- a/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index 113d97d8b8..ee66ef78e6 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -37,19 +37,18 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 maxCo           0.5;
 
-
 functions
 {
     fieldAverage1
@@ -58,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -77,5 +77,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
index f7c5890f48..5207df21bb 100644
--- a/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/ras/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
index b79e14b234..1c2666f2ef 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
index 10de02b0d7..ee1997640a 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
index 88d62b98cc..fc5b4b95bc 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
index 49ae3f8a17..d64bc59993 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
index 467752f0ef..a1706f5b3a 100644
--- a/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
index 229b6c7046..7e56115737 100644
--- a/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
index 4609dc364a..98545e5953 100644
--- a/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
index 711c877178..2538fb4a58 100644
--- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
index 2243969127..9a331d0afe 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
index 113b703349..b146e22489 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index d53cf7983e..9e4c9487fa 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -37,26 +37,28 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
     forces
     {
-        type        forceCoeffs;
+        type            forceCoeffs;
         functionObjectLibs ( "libforces.so" );
-        outputControl timeStep;
-        outputInterval 1;
+        outputControl   timeStep;
+        outputInterval  1;
+
         patches
         (
             WALL10
         );
+
         pName       p;
         UName       U;
         log         true;
@@ -71,5 +73,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
index a9f43fbb9e..b67a03963c 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/prism/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
index 2f43908bcf..8b219f140b 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
index cf92f926cc..d67f3c119c 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
index 83c46d5907..26b01f238a 100644
--- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
index 2e26dcc5d6..abee5850f1 100644
--- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict
@@ -37,90 +37,90 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
index 44ba6548b4..31f6cf1b8d 100644
--- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
+++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict
@@ -38,104 +38,104 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
 functions
-(
+{
     dsmcFields1
     {
-        type dsmcFields;
-        enabled   on;
+        type            dsmcFields;
         functionObjectLibs ( "libutilityFunctionObjects.so" );
-        outputControl     outputTime;
+        enabled         true;
+        outputControl   outputTime;
     }
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
-        resetOnOutput     off;
+        outputControl   outputTime;
+        resetOnOutput   off;
+
         fields
         (
             rhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             rhoM
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             dsmcRhoN
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             momentum
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             linearKE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             internalE
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             iDof
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             q
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
             fD
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 
     forces1
     {
-        type        forces;
-        enabled     on;
+        type            forces;
+        enabled         true;
         functionObjectLibs ( "libforces.so" );
-        outputControl     outputTime;
-        patches     ( obstacle );
+        outputControl   outputTime;
+        patches         ( obstacle );
         directForceDensity true;
-        fDName      fDMean;
-        CofR        ( 0 0 0 );
-        log         on;
+        fDName          fDMean;
+        CofR            ( 0 0 0 );
+        log             on;
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
index 4e7379793c..6846736f6b 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
index 4c457aca58..dda6c1a4de 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
index 6f3bab47af..708791f4ec 100644
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
index ff30dab3ea..bf764fc1e0 100644
--- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
+++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
index ba9f94e16e..3a20fa96d5 100644
--- a/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
+++ b/tutorials/electromagnetics/mhdFoam/hartmann/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/financial/financialFoam/europeanCall/system/controlDict b/tutorials/financial/financialFoam/europeanCall/system/controlDict
index 5f82f054df..ce4e3a02f6 100644
--- a/tutorials/financial/financialFoam/europeanCall/system/controlDict
+++ b/tutorials/financial/financialFoam/europeanCall/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
index a2bd31228b..53d1882a04 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
index ee44e2cc05..7110aa11fb 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
index 85273a5e8e..9ed612f7fd 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
index f27c341a65..11e3efe957 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
index aecc274b4b..e250c63939 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/controlDict
@@ -36,13 +36,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
index 86ff949dd9..e2e21ebece 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
index 6733a15023..7528e1c6c3 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
index 58fd12acff..ed46d31ca4 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
index c6953a7d27..846a89461b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/controlDict
@@ -39,13 +39,13 @@ writeFormat     ascii;
 
 writePrecision  7;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 maxCo           0.3;
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
index 845eb956c1..2f3a0001ef 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict
@@ -40,13 +40,13 @@ writeFormat     ascii;
 
 writePrecision  7;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 maxCo           0.3;
 
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
index 2eaccf5916..95adb71e42 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
index 733efddbc0..9ac6b42a1a 100644
--- a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/controlDict
@@ -37,12 +37,12 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   12;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
index d66c8b5c05..65ab5dd49a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
index d66c8b5c05..65ab5dd49a 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
index 7bf69941d9..0f67e68096 100644
--- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
+++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/system/controlDict
@@ -44,13 +44,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 graphFormat     raw;
 
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 86186d7b44..3f087960b9 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -53,6 +53,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
diff --git a/tutorials/incompressible/icoFoam/cavity/system/controlDict b/tutorials/incompressible/icoFoam/cavity/system/controlDict
index 0e0ad67efd..9010dcf8be 100644
--- a/tutorials/incompressible/icoFoam/cavity/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
index e205e75c4d..43e86aee43 100644
--- a/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityClipped/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
index 853fdc3f1c..4fdb6f820f 100644
--- a/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
+++ b/tutorials/incompressible/icoFoam/cavityGrade/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/icoFoam/elbow/system/controlDict b/tutorials/incompressible/icoFoam/elbow/system/controlDict
index ab4cee61e1..68280b0306 100644
--- a/tutorials/incompressible/icoFoam/elbow/system/controlDict
+++ b/tutorials/incompressible/icoFoam/elbow/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
index 4627c47f66..70c54bacd9 100644
--- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
+++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
index fac973c9f9..a4dca3b050 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index 57334dbe9a..f1c8b83674 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -53,11 +53,22 @@ functions
 {
     probes
     {
-        type        probes;
+        type            probes;
         // Where to load it from
         functionObjectLibs ( "libsampling.so" );
         // Name of the directory for probe data
-        name        probes;
+        name            probes;
+
+        // Write at same frequency as fields
+        outputControl   outputTime;
+        outputInterval  1;
+
+        // Fields to be probed
+        fields
+        (
+            p U
+        );
+
         probeLocations
         (
             ( 1e-06 0 0.01 )        // at inlet
@@ -65,15 +76,7 @@ functions
             ( 0.21 0.20999 0.01 )   // at outlet2
             ( 0.21 0 0.01 )         // at central block
         );
-
-        // Fields to be probed
-        fields ( p U );
-
-        // Write at same frequency as fields
-        outputControl   outputTime;
-        outputInterval  1;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index 736a5c8d08..d7180759a2 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -65,10 +71,6 @@ functions
             ( 0.1778 0.0253 0 )
         );
 
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -77,6 +79,7 @@ functions
         functionObjectLibs ("libfieldFunctionObjects.so");
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -96,5 +99,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index fbef5b4915..ca81fc41e9 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
 {
@@ -54,6 +54,12 @@ functions
         enabled         true;
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -64,10 +70,6 @@ functions
             ( 0.1524 0.0253 0 )
             ( 0.1778 0.0253 0 )
         );
-        fields
-        (
-            p
-        );
     }
 
     fieldAverage1
@@ -76,6 +78,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         true;
         outputControl   outputTime;
+
         fields
         (
             U
diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
index 16d26899f3..07e5c1bcbf 100644
--- a/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/ras/cavity/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
index b82034e8a2..f94e18ff29 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
index f718e03fc7..4e89e54565 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
index c53ead2bb0..5de491639a 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/system/controlDict
@@ -18,7 +18,7 @@ application     shallowWaterFoam;
 
 startFrom       startTime;
 
-startTime      0;
+startTime       0;
 
 stopAt          endTime;
 
@@ -36,13 +36,12 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable no;
-
+runTimeModifiable false;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
index af1b95f6e8..0a6d85ef3d 100644
--- a/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index 3c2a064fff..7407d3a47d 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -21,433 +21,433 @@ FoamFile
     {
         type            patch;
         nFaces          320;
-        startFace       1016673;
+        startFace       955219;
     }
     inlet
     {
         type            patch;
         nFaces          64;
-        startFace       1016993;
+        startFace       955539;
     }
     outlet
     {
         type            patch;
         nFaces          64;
-        startFace       1017057;
+        startFace       955603;
     }
     lowerWall
     {
         type            wall;
         nFaces          5330;
-        startFace       1017121;
+        startFace       955667;
     }
     upperWall
     {
         type            patch;
         nFaces          160;
-        startFace       1022451;
+        startFace       960997;
     }
     motorBike_frt-fairing:001%1
     {
         type            wall;
-        nFaces          6626;
-        startFace       1022611;
+        nFaces          6595;
+        startFace       961157;
     }
     motorBike_windshield:002%2
     {
         type            wall;
         nFaces          50;
-        startFace       1029237;
+        startFace       967752;
     }
     motorBike_rr-wh-rim:005%5
     {
         type            wall;
-        nFaces          181;
-        startFace       1029287;
+        nFaces          178;
+        startFace       967802;
     }
     motorBike_rr-wh-rim:010%10
     {
         type            wall;
         nFaces          340;
-        startFace       1029468;
+        startFace       967980;
     }
     motorBike_fr-wh-rim:011%11
     {
         type            wall;
         nFaces          474;
-        startFace       1029808;
+        startFace       968320;
     }
     motorBike_fr-wh-brake-disk:012%12
     {
         type            wall;
         nFaces          54;
-        startFace       1030282;
+        startFace       968794;
     }
     motorBike_frame:016-shadow%13
     {
         type            wall;
-        nFaces          131;
-        startFace       1030336;
+        nFaces          128;
+        startFace       968848;
     }
     motorBike_rear-susp:014%14
     {
         type            wall;
-        nFaces          1073;
-        startFace       1030467;
+        nFaces          1080;
+        startFace       968976;
     }
     motorBike_rear-susp:014-shadow%15
     {
         type            wall;
-        nFaces          159;
-        startFace       1031540;
+        nFaces          149;
+        startFace       970056;
     }
     motorBike_frame:016%16
     {
         type            wall;
-        nFaces          20;
-        startFace       1031699;
+        nFaces          30;
+        startFace       970205;
     }
     motorBike_rr-wh-rim:005-shadow%17
     {
         type            wall;
-        nFaces          25;
-        startFace       1031719;
+        nFaces          27;
+        startFace       970235;
     }
     motorBike_rr-wh-chain-hub:022%22
     {
         type            wall;
         nFaces          141;
-        startFace       1031744;
+        startFace       970262;
     }
     motorBike_rearseat%24
     {
         type            wall;
         nFaces          432;
-        startFace       1031885;
+        startFace       970403;
     }
     motorBike_frt-fairing%25
     {
         type            wall;
         nFaces          626;
-        startFace       1032317;
+        startFace       970835;
     }
     motorBike_windshield%26
     {
         type            wall;
-        nFaces          428;
-        startFace       1032943;
+        nFaces          432;
+        startFace       971461;
     }
     motorBike_headlights%27
     {
         type            wall;
         nFaces          161;
-        startFace       1033371;
+        startFace       971893;
     }
     motorBike_driversseat%28
     {
         type            wall;
         nFaces          367;
-        startFace       1033532;
+        startFace       972054;
     }
     motorBike_rear-body%29
     {
         type            wall;
         nFaces          2076;
-        startFace       1033899;
+        startFace       972421;
     }
     motorBike_fuel-tank%30
     {
         type            wall;
         nFaces          912;
-        startFace       1035975;
+        startFace       974497;
     }
     motorBike_exhaust%31
     {
         type            wall;
-        nFaces          2391;
-        startFace       1036887;
+        nFaces          2390;
+        startFace       975409;
     }
     motorBike_rr-wh-rim%32
     {
         type            wall;
         nFaces          1430;
-        startFace       1039278;
+        startFace       977799;
     }
     motorBike_fr-mud-guard%33
     {
         type            wall;
-        nFaces          767;
-        startFace       1040708;
+        nFaces          758;
+        startFace       979229;
     }
     motorBike_fr-wh-rim%34
     {
         type            wall;
-        nFaces          592;
-        startFace       1041475;
+        nFaces          591;
+        startFace       979987;
     }
     motorBike_fr-wh-brake-disk%35
     {
         type            wall;
-        nFaces          533;
-        startFace       1042067;
+        nFaces          534;
+        startFace       980578;
     }
     motorBike_fr-brake-caliper%36
     {
         type            wall;
         nFaces          164;
-        startFace       1042600;
+        startFace       981112;
     }
     motorBike_fr-wh-tyre%37
     {
         type            wall;
-        nFaces          1118;
-        startFace       1042764;
+        nFaces          1116;
+        startFace       981276;
     }
     motorBike_hbars%38
     {
         type            wall;
         nFaces          535;
-        startFace       1043882;
+        startFace       982392;
     }
     motorBike_fr-forks%39
     {
         type            wall;
-        nFaces          1144;
-        startFace       1044417;
+        nFaces          1143;
+        startFace       982927;
     }
     motorBike_chain%40
     {
         type            wall;
         nFaces          474;
-        startFace       1045561;
+        startFace       984070;
     }
     motorBike_rr-wh-tyre%41
     {
         type            wall;
-        nFaces          1785;
-        startFace       1046035;
+        nFaces          1786;
+        startFace       984544;
     }
     motorBike_square-dial%42
     {
         type            wall;
         nFaces          6;
-        startFace       1047820;
+        startFace       986330;
     }
     motorBike_round-dial%43
     {
         type            wall;
-        nFaces          18;
-        startFace       1047826;
+        nFaces          17;
+        startFace       986336;
     }
     motorBike_dial-holder%44
     {
         type            wall;
         nFaces          87;
-        startFace       1047844;
+        startFace       986353;
     }
     motorBike_rear-susp%45
     {
         type            wall;
-        nFaces          1787;
-        startFace       1047931;
+        nFaces          1786;
+        startFace       986440;
     }
     motorBike_rear-brake-lights%46
     {
         type            wall;
         nFaces          54;
-        startFace       1049718;
+        startFace       988226;
     }
     motorBike_rear-light-bracket%47
     {
         type            wall;
         nFaces          163;
-        startFace       1049772;
+        startFace       988280;
     }
     motorBike_frame%48
     {
         type            wall;
         nFaces          2040;
-        startFace       1049935;
+        startFace       988443;
     }
     motorBike_rear-mud-guard%49
     {
         type            wall;
-        nFaces          804;
-        startFace       1051975;
+        nFaces          798;
+        startFace       990483;
     }
     motorBike_rear-susp-spring-damp%50
     {
         type            wall;
-        nFaces          125;
-        startFace       1052779;
+        nFaces          124;
+        startFace       991281;
     }
     motorBike_fairing-inner-plate%51
     {
         type            wall;
         nFaces          446;
-        startFace       1052904;
+        startFace       991405;
     }
     motorBike_clutch-housing%52
     {
         type            wall;
-        nFaces          966;
-        startFace       1053350;
+        nFaces          964;
+        startFace       991851;
     }
     motorBike_radiator%53
     {
         type            wall;
-        nFaces          48;
-        startFace       1054316;
+        nFaces          58;
+        startFace       992815;
     }
     motorBike_water-pipe%54
     {
         type            wall;
         nFaces          103;
-        startFace       1054364;
+        startFace       992873;
     }
     motorBike_water-pump%55
     {
         type            wall;
         nFaces          74;
-        startFace       1054467;
+        startFace       992976;
     }
     motorBike_engine%56
     {
         type            wall;
-        nFaces          2384;
-        startFace       1054541;
+        nFaces          2389;
+        startFace       993050;
     }
     motorBike_rear-shock-link%57
     {
         type            wall;
-        nFaces          29;
-        startFace       1056925;
+        nFaces          28;
+        startFace       995439;
     }
     motorBike_rear-brake-fluid-pot-bracket%58
     {
         type            wall;
         nFaces          59;
-        startFace       1056954;
+        startFace       995467;
     }
     motorBike_rear-brake-fluid-pot%59
     {
         type            wall;
         nFaces          53;
-        startFace       1057013;
+        startFace       995526;
     }
     motorBike_footpeg%60
     {
         type            wall;
         nFaces          87;
-        startFace       1057066;
+        startFace       995579;
     }
     motorBike_rr-wh-chain-hub%61
     {
         type            wall;
-        nFaces          145;
-        startFace       1057153;
+        nFaces          143;
+        startFace       995666;
     }
     motorBike_rear-brake-caliper%62
     {
         type            wall;
         nFaces          142;
-        startFace       1057298;
+        startFace       995809;
     }
     motorBike_rider-helmet%65
     {
         type            wall;
         nFaces          583;
-        startFace       1057440;
+        startFace       995951;
     }
     motorBike_rider-visor%66
     {
         type            wall;
         nFaces          95;
-        startFace       1058023;
+        startFace       996534;
     }
     motorBike_rider-boots%67
     {
         type            wall;
         nFaces          1025;
-        startFace       1058118;
+        startFace       996629;
     }
     motorBike_rider-gloves%68
     {
         type            wall;
         nFaces          320;
-        startFace       1059143;
+        startFace       997654;
     }
     motorBike_rider-body%69
     {
         type            wall;
         nFaces          4555;
-        startFace       1059463;
+        startFace       997974;
     }
     motorBike_frame:0%70
     {
         type            wall;
         nFaces          37;
-        startFace       1064018;
+        startFace       1002529;
     }
     motorBike_frt-fairing:001-shadow%74
     {
         type            wall;
-        nFaces          1274;
-        startFace       1064055;
+        nFaces          1301;
+        startFace       1002566;
     }
     motorBike_windshield-shadow%75
     {
         type            wall;
-        nFaces          101;
-        startFace       1065329;
+        nFaces          97;
+        startFace       1003867;
     }
     motorBike_fr-mud-guard-shadow%81
     {
         type            wall;
-        nFaces          129;
-        startFace       1065430;
+        nFaces          140;
+        startFace       1003964;
     }
     motorBike_fr-wh-brake-disk-shadow%83
     {
         type            wall;
-        nFaces          77;
-        startFace       1065559;
+        nFaces          76;
+        startFace       1004104;
     }
     motorBike_rear-mud-guard-shadow%84
     {
         type            wall;
-        nFaces          138;
-        startFace       1065636;
+        nFaces          137;
+        startFace       1004180;
     }
     motorBike_rear-susp-spring-damp-shadow%85
     {
         type            wall;
         nFaces          15;
-        startFace       1065774;
+        startFace       1004317;
     }
     motorBike_radiator-shadow%86
     {
         type            wall;
-        nFaces          12;
-        startFace       1065789;
+        nFaces          4;
+        startFace       1004332;
     }
     motorBike_rear-shock-link-shadow%87
     {
         type            wall;
-        nFaces          7;
-        startFace       1065801;
+        nFaces          8;
+        startFace       1004336;
     }
     motorBike_rear-brake-fluid-pot-bracket-shadow%88
     {
         type            wall;
-        nFaces          6;
-        startFace       1065808;
+        nFaces          5;
+        startFace       1004344;
     }
     motorBike_rr-wh-chain-hub-shadow%89
     {
         type            wall;
-        nFaces          24;
-        startFace       1065814;
+        nFaces          27;
+        startFace       1004349;
     }
 )
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
index eeb1d43a1d..72478f821e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/controlDict
@@ -18,13 +18,13 @@ libs            ("libincompressibleRASModels.so");
 
 application     simpleFoam;
 
-startFrom       latestTime;
+startFrom       startTime;
 
 startTime       0;
 
 stopAt          endTime;
 
-endTime         500;
+endTime         1000;
 
 deltaT          1;
 
@@ -38,12 +38,12 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
index 7297493347..b83088fb0e 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
@@ -24,7 +24,6 @@ gradSchemes
     default         Gauss linear;
     grad(p)         Gauss linear;
     grad(U)         Gauss linear;
-    //grad(U)         cellLimited Gauss linear 1;
 }
 
 divSchemes
@@ -38,20 +37,17 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear corrected;
-    //default         Gauss linear limited 0.5;
-    //default         Gauss linear limited 0.333;
+    default         Gauss linear limited 0.333;
 }
 
 interpolationSchemes
 {
     default         linear;
-    interpolate(U)  linear;
 }
 
 snGradSchemes
 {
-    default         corrected;
+    default         limited 0.333;
 }
 
 fluxRequired
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index c2f8d5f887..7f1626172b 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -37,46 +37,61 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 functions
-(
+{
+    convergenceChecks
+    {
+        type           residualControl;
+        functionObjectLibs ( "libjobControl.so" );
+        outputControl  timeStep;
+        outputInterval 1;
+
+        maxResiduals
+        {
+            p       1e-2;
+            U       1e-3;
+            "(k|epsilon|omega)" 1e-3;
+        }
+    }
+
     streamLines
     {
-        type streamLine;
+        type            streamLine;
 
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libOpenFOAM.so" "libfieldFunctionObjects.so");
 
         // Output every
-        outputControl outputTime;
-        //outputInterval 10;
+        outputControl   outputTime;
+        // outputInterval 10;
 
-        setFormat vtk;//gnuplot;//xmgr; //raw;  //gnuplot;  //jplot;
+        setFormat       vtk; //gnuplot; //xmgr; //raw; //jplot;
 
         // Velocity field to use for tracking.
         U U;
 
         // Tracked forwards (+U) or backwards (-U)
-        trackForward true;
+        trackForward    true;
 
         // Names of fields to sample. Should contain above velocity field!
         fields (p k U);
 
         // Cells particles can travel before being removed
-        lifeTime 1000;
+        lifeTime        1000;
 
         // Cloud name to use
-        cloudName particleTracks;
+        cloudName       particleTracks;
 
         // Seeding method. See the sampleSets in sampleDict.
-        seedSampleSet uniform;  //cloud;//triSurfaceMeshPointSet;
+        seedSampleSet   uniform;  //cloud;//triSurfaceMeshPointSet;
 
         uniformCoeffs
         {
@@ -87,25 +102,7 @@ functions
             end         (-0.0205 0.0251 0.00001);
             nPoints     10;
         }
-
-//        cloudCoeffs
-//        {
-//            type        cloud;
-//            axis        x;
-//
-//            points
-//            (
-//                (-0.0205936225239282 0.0144729199524163 0.00001)
-//            );
-//        }
-
-//        triSurfaceMeshPointSetCoeffs
-//        {
-//            type        triSurfaceMeshPointSet;
-//            axis        distance;
-//            surface     twoTri.stl;
-//        }
     }
-);
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 7bb078570d..9b2e71312a 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
index cc885d2f1d..ba975ce4f2 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
index 93d2a24a89..a7c44e8f56 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties
@@ -103,8 +103,8 @@ ManualInjectionCoeffs
         {
             minValue        5e-06;
             maxValue        0.0005;
-            d               ( 5e-05 );
-            n               ( 0.5 );
+            d               5e-05;
+            n               0.5;
         }
     }
 }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
index 10d1ead7d1..c6c9779b01 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties
@@ -88,8 +88,8 @@ ManualInjectionCoeffs
         {
             minValue        5e-06;
             maxValue        0.000565;
-            d               ( 4.8e-05 );
-            n               ( 0.5 );
+            d               4.8e-05;
+            n               0.5;
         }
     }
 }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index d056865b15..2ee23fd83a 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
index 76bb2b6b31..b5f8df21a7 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
index 64c9c37c8d..5d37d10cfd 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/controlDict
@@ -35,13 +35,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
index d31fcef49d..b8bb30c409 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/controlDict
@@ -35,13 +35,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -63,6 +63,7 @@ functions
         sourceName      outlet;
         operation       weightedAverage;
         weightField     phi;
+
         fields
         (
             H2O
@@ -71,5 +72,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
index 716a16a4c7..334ea70503 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
index 9388ecb3fb..2b196db829 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
index aff4851a05..5a60774421 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
+thermoType      hsPsiMixtureThermo<reactingMixture<gasThermoPhysics>>;
 
 chemistryReader foamChemistryReader;
 
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
index 0042f56ab8..acd78c5fec 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
index 9e5cf7339a..50a06bdc51 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties
@@ -75,8 +75,8 @@ ManualInjectionCoeffs
         {
             minValue        5e-05;
             maxValue        0.0001;
-            d               ( 7.5e-05 );
-            n               ( 0.5 );
+            d               7.5e-05;
+            n               0.5;
         }
     }
 }
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
index eb85a8803a..ff44ccbd8e 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties
@@ -88,8 +88,8 @@ ManualInjectionCoeffs
         {
             minValue        5e-06;
             maxValue        0.0005;
-            d               ( 5e-05 );
-            n               ( 0.5 );
+            d               5e-05;
+            n               0.5;
         }
     }
 }
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
index 66ed78d824..d8831846bc 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  10;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
index e75261300e..2fe8e5ce8f 100644
--- a/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
+++ b/tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
index afa89fb133..90c84c37bd 100644
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 72db9f8a33..f39b9c294f 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 37b2b36fb4..0dc91c672b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
@@ -57,6 +57,7 @@ functions
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         enabled         false;
         outputControl   outputTime;
+
         fields
         (
             U
@@ -83,5 +84,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
index 3b505dc3ee..8ff1145ed4 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.5;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
index 6037f2ab1b..03d21ada4b 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   10;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
index 6037f2ab1b..03d21ada4b 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   10;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
index 86169f2135..7be42fc88c 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
index b58fa81303..7cb0f3acba 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index af10b7080b..f826ebd757 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,15 +59,17 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
@@ -77,6 +79,7 @@ functions
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index af10b7080b..2f82526c4e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,24 +59,27 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 
     wallPressure
     {
         type            surfaces;
-        functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
+        functionObjectLibs ("libsampling.so");
+
         fields
         (
             p
@@ -94,5 +97,4 @@ functions
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 12fcd77c42..996904416f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 12fcd77c42..996904416f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 12fcd77c42..996904416f 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -59,17 +59,18 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
+
+        fields
+        (
+            p
+        );
+
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
-        fields
-        (
-            p
-        );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
index 8c4c00f816..a1010335ea 100644
--- a/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/testTubeMixer/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
index 8360e0fd1c..f666f4e386 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
index 27a45f9555..aaf742a02c 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
index ad766b12a9..3100d3b915 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  8;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
index cee98fd455..4ddbc2e00b 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/controlDict
@@ -37,15 +37,15 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
-adjustTimeStep  on;
+adjustTimeStep  yes;
 
 maxCo           0.2;
 
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
index a6f556508b..0290419bea 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
index 8be2ec910a..6262dc6bde 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/system/controlDict
@@ -14,37 +14,36 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application                interPhaseChangeFoam;
+application     interPhaseChangeFoam;
 
-startFrom                  latestTime;
+startFrom       latestTime;
 
-startTime                  0;
+startTime       0;
 
-stopAt                     endTime;
+stopAt          endTime;
 
-endTime                    0.05;
+endTime         0.05;
 
-deltaT                     1e-8;
+deltaT          1e-8;
 
-writeControl               adjustableRunTime;
+writeControl    adjustableRunTime;
 
-writeInterval              0.001;
+writeInterval   0.001;
 
-purgeWrite                 0;
+purgeWrite      0;
 
-writeFormat                ascii;
+writeFormat     ascii;
 
-writePrecision             6;
+writePrecision  6;
 
-writeCompression           uncompressed;
+writeCompression off;
 
-timeFormat                 general;
+timeFormat      general;
 
-runTimeModifiable          yes;
+runTimeModifiable true;
 
-adjustTimeStep             on;
-
-maxCo                      1.0;
+adjustTimeStep  yes;
 
+maxCo           1.0;
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
index c945fe73bf..3e99c4a69c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
index c945fe73bf..3e99c4a69c 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index ef409e071a..3a40815c14 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
index b6d0e5c258..b81abb5a4f 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression compressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 0fcde57ac5..1e206833e2 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     binary;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable on;
+runTimeModifiable true;
 
 adjustTimeStep  yes;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index a9f783f78a..0319c356ca 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable on;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index 14d31e3a80..4a5f547a9b 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -37,13 +37,13 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 adjustTimeStep  no;
 
@@ -58,38 +58,38 @@ functions
         type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
         outputControl   outputTime;
+
         fields
         (
             Ua
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             Ub
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             alpha
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                 mean        on;
-                 prime2Mean  off;
-                 base        time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
index b808ad2692..ffee5741cb 100644
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/controlDict
@@ -37,7 +37,7 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
@@ -45,7 +45,7 @@ timePrecision   6;
 
 graphFormat     raw;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
index 473dcfc797..daa78b5501 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict
@@ -35,13 +35,13 @@ purgeWrite      0;
 
 writeFormat     ascii;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //
diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
index b11b030388..70ff5e2110 100644
--- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
+++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/system/controlDict.org
@@ -33,13 +33,13 @@ purgeWrite      0;
 
 writeFormat     ascii;
 
-writeCompression uncompressed;
+writeCompression off;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable yes;
+runTimeModifiable true;
 
 
 // ************************************************************************* //