diff --git a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
index 31b1ab25ccfd6303a743fdcad08d0fbdf9ac6030..cf5d0a40d7535a8a56be7aaf23684b59b551ed13 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceSource.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            faceSource;
-libs ("libfieldFunctionObjects.so");
+libs            ("libfieldFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
index 56d3c16efcfa9693fe6cd39a3c3f61d51c06e432..b63c882f06ae6a8d0a9fd4e6385d5a529d3c4195 100644
--- a/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/faceZoneSource.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceZoneSource.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
diff --git a/etc/caseDicts/postProcessing/faceSource/patchAverage b/etc/caseDicts/postProcessing/faceSource/patchAverage
index 255c751ce1e535fa429d899802be44faa9440347..2923f108ba3b65fd26b499a961d3d3dd0f93c37d 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchAverage
+++ b/etc/caseDicts/postProcessing/faceSource/patchAverage
@@ -5,19 +5,11 @@
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      patchAverage;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 patchAverage
 {
     patch  <patchName>;
-    fields ( p );
+    fields (p);
 
     operation average;
     #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg";
diff --git a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
index a1bd471a089b873f56aa05593df160d2679fa13d..d5bd7fd1afe8078c77df243cde73dc339081697c 100644
--- a/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/patchSource.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      patchSource.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
diff --git a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
index 23db54b242ed1981a5fb8d9c7fb9a9967a5a7842..4bcbde878d61ea14a71a3a6f544658d368331be4 100644
--- a/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
+++ b/etc/caseDicts/postProcessing/faceSource/surfaceSource.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      surfaceSource.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
 
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2 b/etc/caseDicts/postProcessing/fields/Lambda2
index 31170e2f5baeec221c2fc2f184a7e258fad27e3d..71327211066e68785ed5f5de588c659fb9d1ab0a 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2
+++ b/etc/caseDicts/postProcessing/fields/Lambda2
@@ -1,22 +1,18 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      Lambda2.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Lambda2
 {
-    #includeEtc "caseDicts/postProcessing/fields/Lambda2.cfg"
+    type            Lambda2;
+    libs            ("libutilityFunctionObjects.so");
+
+    executeControl  writeTime;
+    writeControl    writeTime;
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg
deleted file mode 100644
index cb4a63de6f25b427aad5ef98678efc71720d8621..0000000000000000000000000000000000000000
--- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      Lambda2.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-type            Lambda2;
-libs ("libutilityFunctionObjects.so");
-
-enabled         true;
-writeControl   writeTime;
-
-// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg
deleted file mode 100644
index d486d85ae4661bfb3b7567b7b9f53b528562aab4..0000000000000000000000000000000000000000
--- a/etc/caseDicts/postProcessing/fields/Q.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      Q.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-type            Q;
-libs ("libutilityFunctionObjects.so");
-
-enabled         true;
-writeControl   writeTime;
-
-// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise
index 8a98fe663d856d08767bd2fdebf5015558bdf250..cd873d76549a8590a6aad50d558e1fc047b02ec0 100644
--- a/etc/caseDicts/postProcessing/fields/randomise
+++ b/etc/caseDicts/postProcessing/fields/randomise
@@ -8,10 +8,10 @@
 
 randomise
 {
+    #includeEtc "caseDicts/postProcessing/fields/randomise.cfg"
+
     // Set the magnitude of the perturbation
     magPerturbation <scalar>;
-
-    #includeEtc "caseDicts/postProcessing/fields/randomise.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
index 9e5385a2f2519c9c433994105b6154aa3cf9494e..7eb8d0873c4e78021f38e4137759d9d7e3729a47 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      flowRatePatch;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This packaged function object sums the flux phi on patch faces so the
 // calculated volume flow rate for solvers where phi = volumetric flux, and
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
index b73dae82ef9392e1e1205fcaad85a987622a79db..7ab9aee3e14c9dc9ae7a40c01bef99ef318eb17c 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      flowRatePatch.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/faceSource/patchSource.cfg"
 
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
index bcaa82a8745fa233ab3146487f1fc1b4f5569205..1f64e1e5b2555c1ee3e8cf4bf89b28f7dcc2d668 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      volFlowRateSurface;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // This packaged function object interpolates velocity U onto triangles in
 // triSurface file and integrates over the surface area.  Triangles need to
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
index d8f7546c6eb994ad0159549225aeef9b5ad0a747..6ec52f78ab3aebce41b9cd7cdc5f85593d1c9de4 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      volFlowRateSurface.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/faceSource/surfaceSource.cfg"
 
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
index e2021318bc0987deea24cb65341acaa810e2f581..d9d83a75d3d36145a8e7e21a80b930ba97e31a91 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffs.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forceCoeffs.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index 3a45f320e45da20663393aa94c48fee6c8e888d5..dbd6124827f907b7e2112ee89403153072357989 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -1,22 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forceCoeffsCompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 forceCoeffs
 {
-    patches     ( patch1 patch2 );
+    patches     (patch1 patch2);
 
     magUInf     20;
     rhoInf      1.225;
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
index 513aec09d81f13d159a5de1d3f4cd6baf2a78fe5..87a8667d875e9881cdea8da44e9e5b12fab21082 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg
@@ -1,20 +1,11 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forceCoeffsCompressible.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
-rhoName         rho;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
index fab22803536e5b3c3154db329d58a7f66ab7102d..89926a516fbfc24c4bf51f3304514faf5552b923 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
@@ -1,22 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forceCoeffsIncompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 forceCoeffs
 {
-    patches     ( patch1 patch2 );
+    patches     (patch1 patch2);
 
     magUInf     20;
     lRef        1;
diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg
index 97b9cd833a673e1db1b7d89cc02c4ade8a4b6459..9f0e3f778060b45b9bb279a8605fc1a945ffb798 100644
--- a/etc/caseDicts/postProcessing/forces/forces.cfg
+++ b/etc/caseDicts/postProcessing/forces/forces.cfg
@@ -1,29 +1,18 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forces.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            forces;
-libs ( "libforces.so" );
+libs            ("libforces.so");
 
-enabled         true;
-writeControl   timeStep;
-writeInterval  1;
+writeControl    timeStep;
+writeInterval   1;
 
-pName           p;
-UName           U;
-rhoName         rhoInf; // Incompressible solver
+rho             rhoInf; // Incompressible solver
 log             off;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index 1c8607be20785bd32eaab64cf3322a68170a0c9c..1792b0c38195223ab7842d548a44dd82e6e1cfef 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -1,22 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forcesCompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 forces
 {
-    patches     ( patch1 patch2 );
+    patches     (patch1 patch2);
 
     CofR        (0 0 0);
     pitchAxis   (0 1 0);
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
index a8a630a9c14ad1a82a67031ba9bac5e4ed9361bf..66604a4a09eeae725c0e6e7ace7af3b84eced770 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible.cfg
@@ -1,21 +1,13 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forcesCompressible.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
-rhoName         rho;
+
 rhoInf          1;  // Redundant
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 8dc16603cfc0309493ce1c7f688df4234f704c3f..0b91e37f51740575f3e03cf38b581120e511d703 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -1,28 +1,20 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      forcesIncompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 forces
 {
+    #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
+
     rhoInf      1.225;    // Fluid density
-    patches     ( patch1 patch2 );
+    patches     (patch1 patch2);
 
     CofR        (0 0 0);
     pitchAxis   (0 1 0);
-
-    #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg
index 2959089784ff7e3fc371243e6390ccc54132fa6d..a0a008a34bc1208ff12c2fad7fd89d9ed34099e0 100644
--- a/etc/caseDicts/postProcessing/graphs/graph.cfg
+++ b/etc/caseDicts/postProcessing/graphs/graph.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      graph.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            sets;
-libs ("libsampling.so");
+libs            ("libsampling.so");
 
-enabled         true;
-writeControl   writeTime;
+writeControl    writeTime;
 
 sets
 (
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict b/etc/caseDicts/postProcessing/graphs/sampleDict
index 6b535efd7b439ae6056d916d64b9257f2f30a52b..7731f411f3b332cc1d5e6e8fa77dfe6804ae78a1 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      sampleDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
 
@@ -26,6 +18,6 @@ sets
     }
 );
 
-fields          ( U p );
+fields          (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
index bdbe894be6834488d19ebcc96e7c6381d444a194..17edcf4e502f8157e205bc4effb9d293ad0b8b98 100644
--- a/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
+++ b/etc/caseDicts/postProcessing/graphs/sampleDict.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      sampleDict.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 interpolationScheme cellPoint;
 
diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph
index dcbd48189eee825d1361116229acc041fa7c5574..836d7a82c913e6ced700d613253dc063baded2d5 100644
--- a/etc/caseDicts/postProcessing/graphs/singleGraph
+++ b/etc/caseDicts/postProcessing/graphs/singleGraph
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      graph;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 graph
 {
     start   (0 1e-06 0);
     end     (1 1e-06 0);
-    fields  ( U p );
+    fields  (U p);
 
     #includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
 
diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax
index e0eac71863743c58844166fb15704b98e20cb8ea..815a7f7f3444fc28b45ee6d5db193572736756b2 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMax
+++ b/etc/caseDicts/postProcessing/minMax/cellMax
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      cellMax;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 cellMax
 {
-    fields ( U p );
-
     #includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
+
+    fields (U p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin
index ba20b659de74011bba852b73dd59efd4437eff88..aea52c7b69c39dc77017942575affc26d18cb237 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin
+++ b/etc/caseDicts/postProcessing/minMax/cellMin
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      cellMin;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 cellMin
 {
-    fields ( U p );
-
     #includeEtc "caseDicts/postProcessing/minMax/cellMin.cfg"
+
+    fields (U p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin.cfg b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
index 7cd162d9d6feec755b52f77c6afab13a64f3a2ee..dc0e49df2387b6ecc7cac00c9b980bb37361a470 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMin.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      cellMin.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
 operation       min;
diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
index 5374dc7dcd0bf9a092069f585120441709369317..acabaa55d86596f8f288a8a338e77fa044105053 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      cellMinMax.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            cellSource;
-libs ("libfieldFunctionObjects.so");
+libs            ("libfieldFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax
index f1cffd0ff4ffe85423576795d8fa95049ab8f6d5..d8b4f6fd09454846db0d5ce438e259de5c2f6146 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMax
+++ b/etc/caseDicts/postProcessing/minMax/faceMax
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceMax;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 faceMax
 {
-    fields ( U p );
-
     #includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
+
+    fields (U p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin
index dd5181eff85d95bc19515522b88be62bd94d635f..0c82ec01ddf50cfd43012ddc1a552058c75b68dd 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin
+++ b/etc/caseDicts/postProcessing/minMax/faceMin
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceMin;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 faceMin
 {
-    fields ( U p );
-
     #includeEtc "caseDicts/postProcessing/minMax/faceMin.cfg"
+
+    fields (U p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin.cfg b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
index 111b8368e768490a418cb6228826511feeadb693..f2bf1aeeef09056487de72babf9e63fc62dd9e5e 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMin.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceMin.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
 operation       min;
diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
index 24053044446ba8adc2a4338d073fb4dda6668c60..034edd14a15b9516ce0f302590357bace9d5cfb3 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      faceMinMax.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            faceSource;
-libs ("libfieldFunctionObjects.so");
+libs            ("libfieldFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1;
 
 valueOutput     false;
diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
index b77e7f66e2f85aede275031608629ae3f0bf8e39..126b63c3470da8f50c71bee56ca871cc1d909840 100644
--- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
+++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      fieldMinMax.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            fieldMinMax;
-libs ("libfieldFunctionObjects.so");
+libs            ("libfieldFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1;
 
 write           true;
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents
index 999509c9343f67c4dafdea5238497de816fbba9b..71db684633fd5a5b06ada53b73b76a16ed6bb0f4 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      minMaxComponents;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 minMaxComponents
 {
-    mode components;
-
     #includeEtc "caseDicts/postProcessing/minMax/minMaxComponents.cfg"
+
+    mode components;
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
index a4b2cdb5b9fee8dd3c67198842066d37928a04ad..f18af3c91f9790a3727c10a3164a327f16bcd11d 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      minMaxComponents.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
 mode components;
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
index 155d460bdfd8af2941f3058238a2ee923eb4d036..3691baa8c09dc9c1653805780fc6be4bd2c7b71d 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
+++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      minMaxMagnitude;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 minMaxMagnitude
 {
-    fields ( U p );
-
     #includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
+
+    fields (U p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/postProcessing/numerical/residuals
index 3719ca29ba50507759535966aa716fdc6ecdd854..d4e937ecc720878dea685b75a9f17aff81e1e719 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals
+++ b/etc/caseDicts/postProcessing/numerical/residuals
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      residuals;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 residuals
 {
-    fields ( p U );
-
     #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
+
+    fields (p U);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/postProcessing/numerical/residuals.cfg
index 9ed37bca8ef504aab0399d150a8dd13c2bf71660..22d95db0f7b412881bbcd18aea75e437a462cd50 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals.cfg
+++ b/etc/caseDicts/postProcessing/numerical/residuals.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      residuals.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            residuals;
-libs ("libutilityFunctionObjects.so");
+libs            ("libutilityFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
-writeInterval  1;
+writeControl    timeStep;
+writeInterval   1;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressure.cfg
similarity index 82%
rename from etc/caseDicts/postProcessing/pressure/pressureTools.cfg
rename to etc/caseDicts/postProcessing/pressure/pressure.cfg
index 47a1f60ad18679d9640a33907d5388b61b94f0a3..39a2fa681986006c2326d56b84f4bbb7c6fbb22b 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressure.cfg
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -10,15 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      pressureTools.cfg;
+    object      pressure.cfg;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type            pressureTools;
-libs ("libutilityFunctionObjects.so");
+type            pressure;
+libs            ("libutilityFunctionObjects.so");
 
-enabled         true;
-writeControl   writeTime;
+executeControl  writeTime;
+writeControl    writeTime;
 log             false;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
index f93107379ddf42a5029447b0196b99d551c8d2b3..9636eac4d5166d74b6d00318e4ee0b931ace4ef5 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg
@@ -1,26 +1,17 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      pressureDifference.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            fieldValueDelta;
-libs ("libfieldFunctionObjects.so");
+libs            ("libfieldFunctionObjects.so");
 
 operation       subtract;
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1
 log             false;
 
@@ -28,13 +19,13 @@ source1
 {
     #includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
     operation       areaAverage;
-    fields          ( p );
+    fields          (p);
 }
 source2
 {
     #includeEtc "caseDicts/postProcessing/faceSource/faceSource.cfg"
     operation       areaAverage;
-    fields          ( p );
+    fields          (p);
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
index 8131375e9d78ca68f4240a92a548adf95725d07e..8bb8360cb7e6cc2cc5bdecdda43936c961577c60 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      pressureDifferencePatch;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 pressureDifferencePatch
 {
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
index c13b3167029cacec7c35d684dc6e26e13da4f784..01a239236fba83249cdaa8f1a432e10e5bef055b 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      pressureDifferencePatch.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
 
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
index ba981ad7c7be780f5a1715f4341e8252d6a18bfa..e83ccdabc8c463fb93b039b0c4356e5b6cf66d19 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      pressureDifferenceSurface;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 pressureDifferenceSurface
 {
@@ -20,7 +12,7 @@ pressureDifferenceSurface
     triSurface2 <triSurface2>;
 
     #includeEtc
-    "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg"
+        "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
index 9d782905cc3095632dd0f2699587f72ff8f7626e..c1df7cff5bc7cd4444daea099e110df024f81c8a 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      pressureDifferenceSurface.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/pressure/pressureDifference.cfg"
 
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure
index 3aee436f901ecf721a36ef84f6d6928e7c946ea9..97f79325b274aadb43b60c944f0d2345ab6ae3df 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      staticPressure;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 staticPressure
 {
-    rho 1.2; // Density to scale
-
     #includeEtc "caseDicts/postProcessing/pressure/staticPressure.cfg"
+
+    rho 1.2; // Density to scale
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
index 6b7b5b1005c2ea708ff44a2353c8edb101e75371..5283b1ee1231b0968c015c5e5c87a88a32525e96 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure.cfg
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      staticPressure.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#includeEtc "caseDicts/postProcessing/pressure/pressureTools.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     no;
 calcCoeff     no;
-rhoName       rhoInf;
+rho           rhoInf;
 rhoInf        $rho;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
index 8712bb938700561a9cb7d803d73e35fbe2f2f864..b2a67de034e55979bd8b398fa1bad089eb23afd1 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
@@ -1,25 +1,17 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      totalPressureCompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 totalPressure
 {
-    pRef  0.0;
-
     #includeEtc
-    "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg"
+        "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg"
+
+    pRef    0;
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
index 0e083f2a2569a4b292ecc37c8192daa5ded6deb3..6a86d3949fce956896b3787045bfb22ba7ffae93 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible.cfg
@@ -1,23 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      totalPressureCompressible.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#includeEtc "caseDicts/postProcessing/pressure/pressureTools.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     no;
 calcCoeff     no;
-rhoName       rho;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
index 24a50c5637efb0ca2f85974948f36e728ba67f7b..b4daf266341bdc341d0734ed73ac3ae10f794dfe 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
@@ -1,26 +1,18 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      totalPressureIncompressible;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 totalPressure
 {
+    #includeEtc
+        "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg"
+
     pRef  0.0;
     rho   1.2;
-
-    #includeEtc
-    "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
index d90f92a05231638f4305c72f15f7175f522d8276..c5f2833ac531482d795eeed729dd9563185e9624 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      totalPressureIncompressible.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#includeEtc "caseDicts/postProcessing/pressure/pressureTools.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/pressure.cfg"
 
 calcTotal     yes;
 calcCoeff     no;
-rhoName       rhoInf;
+rho           rhoInf;
 rhoInf        $rho;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud
index 1f79a97b883c3962c538ecc244ee740e1bbbc211..72b0da5b76c57cae259bbca05ff6b1029094d0df 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud
@@ -1,22 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      boundaryCloud;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 boundaryCloud
 {
-    fields ( p U );
+    fields (p U);
 
     points
     (
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
index 5df71dc2c3a4250960c9a55216c247941777e2cc..d90c94122bd380b23184bd27600998191365a580 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      boundaryCloud.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/probes/cloud.cfg"
 
diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg
index 6ce08876f2af117fe46a305c7d90ce9c2d3d56bf..28d3bc8c9d93116888123440708df71d22fc9940 100644
--- a/etc/caseDicts/postProcessing/probes/cloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/cloud.cfg
@@ -1,23 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      cloud.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            sets;
-libs ("libsampling.so");
+libs            ("libsampling.so");
 
-enabled         true;
-writeControl   writeTime;
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud
index 8a914bbd5752d5478993529f4eb436adbba85dc2..e5ba0c2541dd1428f749ab791044687efe90facb 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud
+++ b/etc/caseDicts/postProcessing/probes/internalCloud
@@ -1,22 +1,14 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      internalCloud;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 internalCloud
 {
-    fields ( p U );
+    fields (p U);
     points
     (
         (0 0 0)
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud.cfg b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
index e0e60d206a7f210ccdabf73cae537fbbdebae0ba..19bf54f8983077b55671b39441742cab76f6768e 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud.cfg
+++ b/etc/caseDicts/postProcessing/probes/internalCloud.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      internalCloud.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #includeEtc "caseDicts/postProcessing/probes/cloud.cfg"
 
diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes
index 774deb5d8078a79b8cbc6f00d67f16c86bfb19ae..f5936b06b3b09daeea7c84ebcbbbebadc57d6a06 100644
--- a/etc/caseDicts/postProcessing/probes/probes
+++ b/etc/caseDicts/postProcessing/probes/probes
@@ -1,28 +1,20 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      probes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 probes
 {
-    fields ( p U );
+    #includeEtc "caseDicts/postProcessing/probes/probes.cfg"
+
+    fields (p U);
     probeLocations
     (
         (0 0 0)
     );
-
-    #includeEtc "caseDicts/postProcessing/probes/probes.cfg"
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg
index a3eb75d98ad4105b2027c2ec32040b4def08bc76..e23f9c8388ea733fcc5006b3362ac2c07278e3fb 100644
--- a/etc/caseDicts/postProcessing/probes/probes.cfg
+++ b/etc/caseDicts/postProcessing/probes/probes.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      probes.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            probes;
-libs ("libsampling.so");
+libs            ("libsampling.so");
 
-enabled         true;
-writeControl   timeStep;
-writeInterval  1;
+writeControl    timeStep;
+writeInterval   1;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/scalarTransport/T b/etc/caseDicts/postProcessing/scalarTransport/T
index 44fcc9ac00842f8c7bd90e104224fcd8cd1eccd3..67158af3a24b5105ba56a0135a2de48d67abef74 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/T
+++ b/etc/caseDicts/postProcessing/scalarTransport/T
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Tinlet          1;
 
@@ -34,7 +26,6 @@ boundaryField
     }
 
     #includeEtc "caseDicts/setConstraintTypes"
-
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
index 50d63e2cd4c5b26c0f108dea34e71e3060aed15f..c1204f7e731512539f1f34bbf1891fad6aa65fbc 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      scalarTransport.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 T
 {
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
index 7f21398303cf4b5731a06eaf6fb6286ad159cf1f..f56519f3f9650ea14f247bbadb1570349a29d511 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      scalarTransport.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            scalarTransport;
-libs ("libutilityFunctionObjects.so");
+libs            ("libutilityFunctionObjects.so");
 
-enabled         true;
-writeControl   timeStep;
+writeControl    timeStep;
 writeInterval   1;
 
 write           true;
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
index f33d51229d895283e0b175c914c0466192a8062c..32b4bf14032ab4bc8379fd86047de19daabc5b55 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      scalarTransportDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // controlDict settings
 startTime       0;
diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
index 010290ff6822d9348032bbce9bbbcb3b6fb0ee51..588448807215023e946bf448eab1c59f92c3ef31 100644
--- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
+++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransportDict.cfg
@@ -1,18 +1,10 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      scalarTransportDict.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // fvSchemes settings
 ddtSchemes
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines
index 64ac9ff3f47c509f703e7000beaef59393bdbc03..c194eb7efe1be698aea35b56da14ef8d3ed98a68 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines
+++ b/etc/caseDicts/postProcessing/visualization/streamlines
@@ -1,25 +1,17 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      streamlines.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 streamlines
 {
     nLines  20;
     start   (0 -4 1e-06); // Ensure that points do not coincide with
     end     (0  4 1e-06); // mesh faces, but instead lie inside cells
-    fields  ( U p );
+    fields  (U p);
 
     // Must be last entry
     #includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
index e02e8f01e2264bb9fcc431b83bc22816b0e9b55f..891b4c6d0cb97e203c895dc3834d0eaf684da13e 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg
+++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg
@@ -1,26 +1,18 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      streamlines.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            streamLine;
-libs ( "libfieldFunctionObjects.so" );
+libs            ("libfieldFunctionObjects.so");
 
-writeControl   writeTime;
+executeControl  writeTime;
+writeControl    writeTime;
 
 setFormat       vtk;
-UName           U;
 trackForward    true;
 
 lifeTime        10000;
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces
index 45ce485057d80f589f1f4b5a32d5e9abb7469d7e..3b820bd51ee3a959a03804230c1c792ed5d413f0 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces
+++ b/etc/caseDicts/postProcessing/visualization/surfaces
@@ -1,24 +1,16 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      surfaces.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 surfaces
 {
     #includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg"
 
-    fields       ( p U );
+    fields       (p U);
 
     surfaces
     (
@@ -56,7 +48,7 @@ surfaces
         CAD
         {
             $patchSurface;
-            patches     ( CAD );
+            patches     (CAD);
         }
     );
 }
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
index 919d7b4f98d7b5a5ae5b57ea98b28838b9515073..573885089d9af10492dac495397bb6774c93c60b 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg
+++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg
@@ -1,24 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |  
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      surfaces.cfg;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type            surfaces;
-libs ("libsampling.so");
+libs            ("libsampling.so");
 
-enabled         true;
-writeControl   writeTime;
+writeControl    writeTime;
 
 surfaceFormat   vtk;
 interpolationScheme cellPoint;