diff --git a/etc/caseDicts/postProcessing/README b/etc/caseDicts/postProcessing/README
index 2f60dd9a9e..6a33e3bf87 100644
--- a/etc/caseDicts/postProcessing/README
+++ b/etc/caseDicts/postProcessing/README
@@ -32,7 +32,7 @@ Solution:
   sub-dictionary in the case controlDict file, e.g.
   functions
   {
-      #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch"
+      #includeFunc flowRatePatch
       ... other function objects here ...
   }
 
diff --git a/etc/caseDicts/postProcessing/fields/CourantNo b/etc/caseDicts/postProcessing/fields/CourantNo
index 164f96a2ef..4204ba83df 100644
--- a/etc/caseDicts/postProcessing/fields/CourantNo
+++ b/etc/caseDicts/postProcessing/fields/CourantNo
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-CourantNo
-{
-    type            CourantNo;
-    libs            ("libfieldFunctionObjects.so");
+type            CourantNo;
+libs            ("libfieldFunctionObjects.so");
 
-    field           phi;
+field           phi;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Lambda2 b/etc/caseDicts/postProcessing/fields/Lambda2
index 9882cfbb81..e09617a4f8 100644
--- a/etc/caseDicts/postProcessing/fields/Lambda2
+++ b/etc/caseDicts/postProcessing/fields/Lambda2
@@ -12,15 +12,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-Lambda2
-{
-    type            Lambda2;
-    libs            ("libfieldFunctionObjects.so");
+type            Lambda2;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/MachNo b/etc/caseDicts/postProcessing/fields/MachNo
index bbef2d2cb4..ca02b41d6d 100644
--- a/etc/caseDicts/postProcessing/fields/MachNo
+++ b/etc/caseDicts/postProcessing/fields/MachNo
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-MachNo
-{
-    type            MachNo;
-    libs            ("libfieldFunctionObjects.so");
+type            MachNo;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/PecletNo b/etc/caseDicts/postProcessing/fields/PecletNo
index 7d7035cd66..4db8558e33 100644
--- a/etc/caseDicts/postProcessing/fields/PecletNo
+++ b/etc/caseDicts/postProcessing/fields/PecletNo
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-PecletNo
-{
-    type            PecletNo;
-    libs            ("libfieldFunctionObjects.so");
+type            PecletNo;
+libs            ("libfieldFunctionObjects.so");
 
-    field           phi;
+field           phi;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/Q b/etc/caseDicts/postProcessing/fields/Q
index 69d11674db..df92b5caa8 100644
--- a/etc/caseDicts/postProcessing/fields/Q
+++ b/etc/caseDicts/postProcessing/fields/Q
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-Q
-{
-    type            Q;
-    libs            ("libfieldFunctionObjects.so");
+type            Q;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/R b/etc/caseDicts/postProcessing/fields/R
index c4d4bf1f1d..c85005ddc5 100644
--- a/etc/caseDicts/postProcessing/fields/R
+++ b/etc/caseDicts/postProcessing/fields/R
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-R
-{
-    type            turbulenceFields;
-    libs            ("libfieldFunctionObjects.so");
+type            turbulenceFields;
+libs            ("libfieldFunctionObjects.so");
 
-    field           R;
+field           R;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/components b/etc/caseDicts/postProcessing/fields/components
index 40110ff79a..e6ee7372ae 100644
--- a/etc/caseDicts/postProcessing/fields/components
+++ b/etc/caseDicts/postProcessing/fields/components
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-components
-{
-    type            components;
-    libs            ("libfieldFunctionObjects.so");
+type            components;
+libs            ("libfieldFunctionObjects.so");
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/div b/etc/caseDicts/postProcessing/fields/div
index 93a2437114..c13a9e694d 100644
--- a/etc/caseDicts/postProcessing/fields/div
+++ b/etc/caseDicts/postProcessing/fields/div
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-div
-{
-    type            div;
-    libs            ("libfieldFunctionObjects.so");
+type            div;
+libs            ("libfieldFunctionObjects.so");
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/enstrophy b/etc/caseDicts/postProcessing/fields/enstrophy
index 99f64f9529..2693f08d73 100644
--- a/etc/caseDicts/postProcessing/fields/enstrophy
+++ b/etc/caseDicts/postProcessing/fields/enstrophy
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-enstrophy
-{
-    type            enstrophy;
-    libs            ("libfieldFunctionObjects.so");
+type            enstrophy;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/flowType b/etc/caseDicts/postProcessing/fields/flowType
index 997fe3e0b4..a242afb181 100644
--- a/etc/caseDicts/postProcessing/fields/flowType
+++ b/etc/caseDicts/postProcessing/fields/flowType
@@ -13,15 +13,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-flowType
-{
-    type            flowType;
-    libs            ("libfieldFunctionObjects.so");
+type            flowType;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/grad b/etc/caseDicts/postProcessing/fields/grad
index a56efbb0c7..9e3dab749b 100644
--- a/etc/caseDicts/postProcessing/fields/grad
+++ b/etc/caseDicts/postProcessing/fields/grad
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-grad
-{
-    type            grad;
-    libs            ("libfieldFunctionObjects.so");
+type            grad;
+libs            ("libfieldFunctionObjects.so");
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/mag b/etc/caseDicts/postProcessing/fields/mag
index 3c360974b6..5f3d448a15 100644
--- a/etc/caseDicts/postProcessing/fields/mag
+++ b/etc/caseDicts/postProcessing/fields/mag
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-mag
-{
-    type            mag;
-    libs            ("libfieldFunctionObjects.so");
+type            mag;
+libs            ("libfieldFunctionObjects.so");
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/magSqr b/etc/caseDicts/postProcessing/fields/magSqr
index a2742446c2..8a1c6c8e21 100644
--- a/etc/caseDicts/postProcessing/fields/magSqr
+++ b/etc/caseDicts/postProcessing/fields/magSqr
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-magSqr
-{
-    type            magSqr;
-    libs            ("libfieldFunctionObjects.so");
+type            magSqr;
+libs            ("libfieldFunctionObjects.so");
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/randomise b/etc/caseDicts/postProcessing/fields/randomise
index 1fe72c26e5..490e2b0bc4 100644
--- a/etc/caseDicts/postProcessing/fields/randomise
+++ b/etc/caseDicts/postProcessing/fields/randomise
@@ -11,14 +11,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-randomise
-{
-    #includeEtc "caseDicts/postProcessing/fields/randomise.cfg"
+#includeEtc "caseDicts/postProcessing/fields/randomise.cfg"
 
-    field           <fieldName>;
+field           <fieldName>;
 
-    // Set the magnitude of the perturbation
-    magPerturbation <scalar>;
-}
+// Set the magnitude of the perturbation
+magPerturbation <scalar>;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/turbulenceFields b/etc/caseDicts/postProcessing/fields/turbulenceFields
index eae0183d48..c49d351c3e 100644
--- a/etc/caseDicts/postProcessing/fields/turbulenceFields
+++ b/etc/caseDicts/postProcessing/fields/turbulenceFields
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-turbulenceFields
-{
-    type            turbulenceFields;
-    libs            ("libfieldFunctionObjects.so");
+type            turbulenceFields;
+libs            ("libfieldFunctionObjects.so");
 
-    fields          (<field names>);
+fields          (<field names>);
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/vorticity b/etc/caseDicts/postProcessing/fields/vorticity
index b116630af1..78bc976309 100644
--- a/etc/caseDicts/postProcessing/fields/vorticity
+++ b/etc/caseDicts/postProcessing/fields/vorticity
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-vorticity
-{
-    type            vorticity;
-    libs            ("libfieldFunctionObjects.so");
+type            vorticity;
+libs            ("libfieldFunctionObjects.so");
 
-    field           U;
+field           U;
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/wallShearStress b/etc/caseDicts/postProcessing/fields/wallShearStress
index 0d2873c4cd..95d66dfac6 100644
--- a/etc/caseDicts/postProcessing/fields/wallShearStress
+++ b/etc/caseDicts/postProcessing/fields/wallShearStress
@@ -11,13 +11,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-wallShearStress
-{
-    type            wallShearStress;
-    libs            ("libfieldFunctionObjects.so");
+type            wallShearStress;
+libs            ("libfieldFunctionObjects.so");
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/writeObjects b/etc/caseDicts/postProcessing/fields/writeObjects
index 24cc15eaed..4d43d713cc 100644
--- a/etc/caseDicts/postProcessing/fields/writeObjects
+++ b/etc/caseDicts/postProcessing/fields/writeObjects
@@ -10,14 +10,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-writeObjects
-{
-    type            writeObjects;
-    libs            ("libutilityFunctionObjects.so");
+type            writeObjects;
+libs            ("libutilityFunctionObjects.so");
 
-    objects         (<object names>);
+objects         (<object names>);
 
-    writeControl    writeTime;
-}
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/fields/yPlus b/etc/caseDicts/postProcessing/fields/yPlus
index 6b0c06b6be..894971a8e5 100644
--- a/etc/caseDicts/postProcessing/fields/yPlus
+++ b/etc/caseDicts/postProcessing/fields/yPlus
@@ -10,13 +10,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-yPlus
-{
-    type            yPlus;
-    libs            ("libfieldFunctionObjects.so");
+type            yPlus;
+libs            ("libfieldFunctionObjects.so");
 
-    executeControl  writeTime;
-    writeControl    writeTime;
-}
+executeControl  writeTime;
+writeControl    writeTime;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/flowRate/flowRatePatch b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
index 277b224a88..d425694956 100644
--- a/etc/caseDicts/postProcessing/flowRate/flowRatePatch
+++ b/etc/caseDicts/postProcessing/flowRate/flowRatePatch
@@ -12,11 +12,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-flowRatePatch
-{
-    name    <patchName>;
+name    <patchName>;
 
-    #includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg"
-}
+#includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
index a267d81f14..60b44f42ea 100644
--- a/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
+++ b/etc/caseDicts/postProcessing/flowRate/volFlowRateSurface
@@ -13,11 +13,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-volFlowRateSurface
-{
-    triSurface <triSurfaceFile>;
+triSurface <triSurfaceFile>;
 
-    #includeEtc "caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg"
-}
+#includeEtc "caseDicts/postProcessing/flowRate/volFlowRateSurface.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
index aad0088461..c7e6936a1c 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsCompressible
@@ -12,22 +12,19 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-forceCoeffsCompressible
-{
-    patches     (patch1 patch2);
+patches     (patch1 patch2);
 
-    magUInf     20;
-    rhoInf      1.225;
-    lRef        1;
-    Aref        1;
+magUInf     20;
+rhoInf      1.225;
+lRef        1;
+Aref        1;
 
-    liftDir     (0 0 1);
-    dragDir     (1 0 0);
+liftDir     (0 0 1);
+dragDir     (1 0 0);
 
-    CofR        (0 0 0);
-    pitchAxis   (0 1 0);
+CofR        (0 0 0);
+pitchAxis   (0 1 0);
 
-    #includeEtc "caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg"
-}
+#includeEtc "caseDicts/postProcessing/forces/forceCoeffsCompressible.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
index 2877e5bd76..2b7e5772e1 100644
--- a/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forceCoeffsIncompressible
@@ -12,21 +12,18 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-forceCoeffsIncompressible
-{
-    patches     (patch1 patch2);
+patches     (patch1 patch2);
 
-    magUInf     20;
-    lRef        1;
-    Aref        1;
+magUInf     20;
+lRef        1;
+Aref        1;
 
-    liftDir     (0 0 1);
-    dragDir     (1 0 0);
+liftDir     (0 0 1);
+dragDir     (1 0 0);
 
-    CofR        (0 0 0);
-    pitchAxis   (0 1 0);
+CofR        (0 0 0);
+pitchAxis   (0 1 0);
 
-    #includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
-}
+#includeEtc "caseDicts/postProcessing/forces/forceCoeffs.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesCompressible b/etc/caseDicts/postProcessing/forces/forcesCompressible
index af492d95f7..9814f286eb 100644
--- a/etc/caseDicts/postProcessing/forces/forcesCompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesCompressible
@@ -11,14 +11,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-forcesCompressible
-{
-    patches     (patch1 patch2);
+patches     (patch1 patch2);
 
-    CofR        (0 0 0);
-    pitchAxis   (0 1 0);
+CofR        (0 0 0);
+pitchAxis   (0 1 0);
 
-    #includeEtc "caseDicts/postProcessing/forces/forcesCompressible.cfg"
-}
+#includeEtc "caseDicts/postProcessing/forces/forcesCompressible.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/forces/forcesIncompressible b/etc/caseDicts/postProcessing/forces/forcesIncompressible
index 40982386ad..6437ca2279 100644
--- a/etc/caseDicts/postProcessing/forces/forcesIncompressible
+++ b/etc/caseDicts/postProcessing/forces/forcesIncompressible
@@ -11,15 +11,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-forcesIncompressible
-{
-    #includeEtc "caseDicts/postProcessing/forces/forces.cfg"
+#includeEtc "caseDicts/postProcessing/forces/forces.cfg"
 
-    rhoInf      1.225;    // Fluid density
-    patches     (patch1 patch2);
+rhoInf      1.225;    // Fluid density
+patches     (patch1 patch2);
 
-    CofR        (0 0 0);
-    pitchAxis   (0 1 0);
-}
+CofR        (0 0 0);
+pitchAxis   (0 1 0);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/singleGraph b/etc/caseDicts/postProcessing/graphs/singleGraph
index 9e2d93e3ee..dd04e682b9 100644
--- a/etc/caseDicts/postProcessing/graphs/singleGraph
+++ b/etc/caseDicts/postProcessing/graphs/singleGraph
@@ -11,16 +11,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-singleGraph
-{
-    start   (0 1e-06 0);
-    end     (1 1e-06 0);
-    fields  (U p);
+start   (0 1e-06 0);
+end     (1 1e-06 0);
+fields  (U p);
 
-    #includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
+#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
 
-    // Must be last entry
-    #includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-}
+// Must be last entry
+#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/cellMax b/etc/caseDicts/postProcessing/minMax/cellMax
index eae49b0c63..a04564e585 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMax
+++ b/etc/caseDicts/postProcessing/minMax/cellMax
@@ -10,11 +10,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-cellMax
-{
-    #includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/cellMinMax.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/cellMin b/etc/caseDicts/postProcessing/minMax/cellMin
index 54b8a926b0..fea9570398 100644
--- a/etc/caseDicts/postProcessing/minMax/cellMin
+++ b/etc/caseDicts/postProcessing/minMax/cellMin
@@ -10,11 +10,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-cellMin
-{
-    #includeEtc "caseDicts/postProcessing/minMax/cellMin.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/cellMin.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/faceMax b/etc/caseDicts/postProcessing/minMax/faceMax
index 59225cf4ac..753130e0dd 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMax
+++ b/etc/caseDicts/postProcessing/minMax/faceMax
@@ -10,11 +10,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-faceMax
-{
-    #includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/faceMinMax.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/faceMin b/etc/caseDicts/postProcessing/minMax/faceMin
index 4e12aa5d48..69012867c0 100644
--- a/etc/caseDicts/postProcessing/minMax/faceMin
+++ b/etc/caseDicts/postProcessing/minMax/faceMin
@@ -10,11 +10,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-faceMin
-{
-    #includeEtc "caseDicts/postProcessing/minMax/faceMin.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/faceMin.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxComponents b/etc/caseDicts/postProcessing/minMax/minMaxComponents
index 38dc6fa572..37ee7b05c6 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxComponents
+++ b/etc/caseDicts/postProcessing/minMax/minMaxComponents
@@ -11,11 +11,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-minMaxComponents
-{
-    #includeEtc "caseDicts/postProcessing/minMax/minMaxComponents.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/minMaxComponents.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
index c5feaa33c7..67cdc71cf6 100644
--- a/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
+++ b/etc/caseDicts/postProcessing/minMax/minMaxMagnitude
@@ -11,11 +11,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-minMaxMagnitude
-{
-    #includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
+#includeEtc "caseDicts/postProcessing/minMax/fieldMinMax.cfg"
 
-    fields (U p);
-}
+fields (U p);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/numerical/residuals b/etc/caseDicts/postProcessing/numerical/residuals
index 66d17a4f38..d90cfaf86e 100644
--- a/etc/caseDicts/postProcessing/numerical/residuals
+++ b/etc/caseDicts/postProcessing/numerical/residuals
@@ -12,11 +12,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-residuals
-{
-    #includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
+#includeEtc "caseDicts/postProcessing/numerical/residuals.cfg"
 
-    fields (p U);
-}
+fields (p U);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
index 5e4b987ee3..860135ce6e 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferencePatch
@@ -11,12 +11,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-pressureDifferencePatch
-{
-    patch1 <patch1>;
-    patch2 <patch2>;
+patch1 <patch1>;
+patch2 <patch2>;
 
-    #includeEtc "caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg"
-}
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifferencePatch.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
index b9f71d166e..62fdc3b5b6 100644
--- a/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
+++ b/etc/caseDicts/postProcessing/pressure/pressureDifferenceSurface
@@ -11,12 +11,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-pressureDifferenceSurface
-{
-    triSurface1 <triSurface1>;
-    triSurface2 <triSurface2>;
+triSurface1 <triSurface1>;
+triSurface2 <triSurface2>;
 
-    #includeEtc "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg"
-}
+#includeEtc "caseDicts/postProcessing/pressure/pressureDifferenceSurface.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/staticPressure b/etc/caseDicts/postProcessing/pressure/staticPressure
index f7c84b10de..d57f7032d2 100644
--- a/etc/caseDicts/postProcessing/pressure/staticPressure
+++ b/etc/caseDicts/postProcessing/pressure/staticPressure
@@ -11,11 +11,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-staticPressure
-{
-    #includeEtc "caseDicts/postProcessing/pressure/staticPressure.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/staticPressure.cfg"
 
-    rhoInf 1.2; // Density to scale
-}
+rhoInf 1.2; // Density to scale
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
index 0470beaf38..5492b1433b 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureCompressible
@@ -11,11 +11,8 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-totalPressureCompressible
-{
-    #includeEtc "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/totalPressureCompressible.cfg"
 
-    pRef    0;
-}
+pRef    0;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
index 04af623a5a..e7a1e8b804 100644
--- a/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
+++ b/etc/caseDicts/postProcessing/pressure/totalPressureIncompressible
@@ -11,12 +11,9 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-totalPressureIncompressible
-{
-    #includeEtc "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg"
+#includeEtc "caseDicts/postProcessing/pressure/totalPressureIncompressible.cfg"
 
-    pRef    0.0;
-    rhoInf  1.2;
-}
+pRef    0.0;
+rhoInf  1.2;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/boundaryCloud b/etc/caseDicts/postProcessing/probes/boundaryCloud
index e4302df5e5..5847972f15 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryCloud
+++ b/etc/caseDicts/postProcessing/probes/boundaryCloud
@@ -11,20 +11,17 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-boundaryCloud
-{
-    fields (p U);
+fields (p U);
 
-    points
-    (
-        (0 0 0)
-    );
+points
+(
+    (0 0 0)
+);
 
-    maxDistance 0.1;
+maxDistance 0.1;
 
-    patches     (".*");
+patches     (".*");
 
-    #includeEtc "caseDicts/postProcessing/probes/boundaryCloud.cfg"
-}
+#includeEtc "caseDicts/postProcessing/probes/boundaryCloud.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/internalCloud b/etc/caseDicts/postProcessing/probes/internalCloud
index e4fc9deb26..a2f8794f44 100644
--- a/etc/caseDicts/postProcessing/probes/internalCloud
+++ b/etc/caseDicts/postProcessing/probes/internalCloud
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-internalCloud
-{
-    fields (p U);
-    points
-    (
-        (0 0 0)
-    );
+fields (p U);
+points
+(
+    (0 0 0)
+);
 
-    #includeEtc "caseDicts/postProcessing/probes/internalCloud.cfg"
-}
+#includeEtc "caseDicts/postProcessing/probes/internalCloud.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/probes b/etc/caseDicts/postProcessing/probes/probes
index 5a95e563d4..017d87c9a6 100644
--- a/etc/caseDicts/postProcessing/probes/probes
+++ b/etc/caseDicts/postProcessing/probes/probes
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-probes
-{
-    #includeEtc "caseDicts/postProcessing/probes/probes.cfg"
+#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
 
-    fields (p U);
-    probeLocations
-    (
-        (0 0 0)
-    );
-}
+fields (p U);
+probeLocations
+(
+    (0 0 0)
+);
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
index 0af315e8ae..d5d71b7fc7 100644
--- a/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
+++ b/etc/caseDicts/postProcessing/solvers/scalarTransport/scalarTransport
@@ -14,14 +14,11 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-scalarTransport
-{
-    type            scalarTransport;
-    libs            ("libsolverFunctionObjects.so");
+type            scalarTransport;
+libs            ("libsolverFunctionObjects.so");
 
-    field           s;
-    schemesField    s;
-    D               1e-09;
-}
+field           s;
+schemesField    s;
+D               1e-09;
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage b/etc/caseDicts/postProcessing/surfaceRegion/patchAverage
index 96b660ce90..95a98c50b9 100644
--- a/etc/caseDicts/postProcessing/surfaceRegion/patchAverage
+++ b/etc/caseDicts/postProcessing/surfaceRegion/patchAverage
@@ -10,14 +10,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-patchAverage
-{
-    name    <patchName>;
-    fields  (<field names>);
-
-    operation average;
-    #includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg"
-}
+name    <patchName>;
+fields  (<field names>);
 
+operation average;
+#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate
index d8e1ef086c..4b873a9631 100644
--- a/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate
+++ b/etc/caseDicts/postProcessing/surfaceRegion/patchIntegrate
@@ -10,14 +10,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-patchIntegrate
-{
-    name   <patchName>;
-    fields (<field names>);
-
-    operation areaIntegrate;
-    #includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg"
-}
+name   <patchName>;
+fields (<field names>);
 
+operation areaIntegrate;
+#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/visualization/streamlines b/etc/caseDicts/postProcessing/visualization/streamlines
index bf8312498e..11dff0b537 100644
--- a/etc/caseDicts/postProcessing/visualization/streamlines
+++ b/etc/caseDicts/postProcessing/visualization/streamlines
@@ -10,15 +10,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-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);
+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);
 
-    // Must be last entry
-    #includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
-}
+// Must be last entry
+#includeEtc "caseDicts/postProcessing/visualization/streamlines.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/visualization/surfaces b/etc/caseDicts/postProcessing/visualization/surfaces
index 915517fcc4..a709534d3d 100644
--- a/etc/caseDicts/postProcessing/visualization/surfaces
+++ b/etc/caseDicts/postProcessing/visualization/surfaces
@@ -14,51 +14,48 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg"
+
+fields       (p U);
+
 surfaces
-{
-    #includeEtc "caseDicts/postProcessing/visualization/surfaces.cfg"
+(
+    xNormal
+    {
+        $cuttingPlane;
+    }
 
-    fields       (p U);
-
-    surfaces
-    (
-        xNormal
+    yNormal
+    {
+        $cuttingPlane;
+        pointAndNormalDict
         {
-            $cuttingPlane;
-        }
+            normalVector $y;      // Overrides default normalVector (1 0 0)
+        }                         // $y: macro for (0 1 0)
+    }
 
-        yNormal
+    zNormal
+    {
+        $cuttingPlane;
+        pointAndNormalDict
         {
-            $cuttingPlane;
-            pointAndNormalDict
-            {
-                normalVector $y;      // Overrides default normalVector (1 0 0)
-            }                         // $y: macro for (0 1 0)
+            basePoint    (0 0 2); // Overrides default basePoint (0 0 0)
+            normalVector $z;      // $y: macro for (0 0 1)
         }
+    }
 
-        zNormal
-        {
-            $cuttingPlane;
-            pointAndNormalDict
-            {
-                basePoint    (0 0 2); // Overrides default basePoint (0 0 0)
-                normalVector $z;      // $y: macro for (0 0 1)
-            }
-        }
+    p100
+    {
+        $isosurface;
+        isoField    p;
+        isoValue    100;
+    }
 
-        p100
-        {
-            $isosurface;
-            isoField    p;
-            isoValue    100;
-        }
-
-        CAD
-        {
-            $patchSurface;
-            patches     (CAD);
-        }
-    );
-}
+    CAD
+    {
+        $patchSurface;
+        patches     (CAD);
+    }
+);
 
 // ************************************************************************* //