diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index cc41c03969388a2339c174346420387a28f13888..ca4e0dcb584b61420b431965e32823ea11e8dd1a 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Starting time loop" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
index e9f223faad7abc1ec7bcc1d7d63a98bcf78f9b54..786146219b622aa7a8b7ec6625080ec6f148f22c 100644
--- a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
+++ b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
@@ -53,10 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
-
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         Info<< "Evolving " << kinematicCloud.name() << endl;
@@ -72,7 +70,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 5b56c72a8c97c42c5e64cc1ba8c5a43316df5eaa..7f1a7a00a52e141e2a6ef00347b92af00b94c28c 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating temperature distribution\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index f5ec1ec364eb5553963c1a4c47042b51620c34ac..9d2073bf2e3cf324d45b1d5cb6fffbe6fce4b531 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index ad0107319f8f9a3b44de62bfd5c61b522addfb66..df0ccb8209788762f34f1f72812edbf31e044929 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
 #   include "CourantNo.H"
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index ded711f718ab13d976c4ff0e47470e8aaae08f57..89a7b7f956d2d4b5c03e06f28bb4b0ef4dd33cbc 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -130,7 +130,7 @@ scalar StCoNum = 0.0;
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 53ae8af8befb8a5d1db32635c3b4c83773e2f7a4..1320b19d31440189abf86001dfff6f21abe28b48 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -195,7 +195,7 @@ scalar StCoNum = 0.0;
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 52f513bfb95a2ea0a01654c412a8616c11564587..d18ef0d2f4b91086fcd6bcdd93ad12a5942eb523 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 0e57e0b00b11ba765846a9d283b34f88e85cf939..ddb4c3553009eb6acb7284c01e7c1f6517dfb89e 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index b62adb9ffcb0b934f67d20b99daed18239e0e1b5..927afe9bc28e486ad50704f7b9ad2daecbe88ba8 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 4c41a0db2d75d60ff031f1c8307ee1da80baa360..31d034bc5734e6807843059dff8eea02e17474a8 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index b9b4f140bd5ad662b13f95c6edda148f4d6e1005..a835e8ea4295fc3d04efc3665c751c3ec504020c 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 6d1a9d2caaa46019ab483904b6206652ee0b9505..e915818bdc14525026340f04a7e5339bcd08e740 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 59b0c9e99e6abbc0ba70adc22fa9cd354d46fc00..502406d1322f64edbdd77550ffa90b1f040e1ce1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index 26d388ab24a72f5fca51b9fb2b08e5211944df79..c349e7520e6ad34fd55550c77574107a6ff9fd13 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index b1b11a7cec902ce47e23e0356bef8136da7a78ac..0cd144fce23508b23d803c7abf25510f67f17f99 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d985abe25d85e8278a65296869961ee589fcb815..bf6a9f24f3386c7c1f93237fc244c30f85e87951 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
index b4bdc9e4933cca7a131084d92a779f2caa128313..0571ee5082f177e2ac68e9d3dc570517cad618cf 100644
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         surfaceScalarField phiv
@@ -124,7 +123,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index b3f1c8e06d47fd61674431b4721463ed3ecafe4c..7cd692b71dce38874e8e4a4555e8e0a449df8390 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.value() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -187,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 593bc742cf96c9f0fa246f49877749a2ca1ae719..57b15a0f9ba4e546d59ad17eb9a7129989ca4ad1 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -134,7 +133,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 741141c1c4e3218778969ca7200405e8e9ea5475..6ff79607986802a024e450042be2ad286d6d5b12 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -127,7 +126,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 87dcf947b03565549bfd34248124a3bc2ad3816e..0324da8299896476159dca790e388716a8ca8ac3 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -118,7 +117,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 11daf2e0b4a86817e4564f25ec1d4af4566f11b2..ff0b3ad21a0ac248b21e9f4a6926c3e836a1c684 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting iteration loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration = " << runTime.timeName() << nl << endl;
 
         solve
@@ -73,7 +72,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index e121150c7a3d4f207220738ad5634a89d5ff53b2..d89b636d04392ffff0dae5344587421aec0278c1 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -71,9 +71,8 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Starting time loop" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 #       include "readPISOControls.H"
 #       include "readBPISOControls.H"
 
@@ -163,7 +162,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 9edd07a8d0a21c4b2e9ab8de8aa9bb2af4e489d1..86c18e2ac44a516d05f2ce0a9a5a8aaa49ff01e4 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< "Starting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         delta == fvc::grad(V)().component(Foam::vector::X);
 
         solve
@@ -85,7 +84,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index 1a9f02325380fcdf22461b78323251dd0d5f90bd..bd0ce2ac373a09d4c8816ad5fc990244d31a51d7 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -69,9 +69,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index c8e62813e8fd838beb1ce0c405572aa7d17b5680..26e732cf9c17b30ac63d080b03470a3678290aa0 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -66,9 +66,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index e9c48b937f876419fc118414fdfc74168c987fa6..d91b6398f27144233a20adab7983689e3d000c24 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 21e4912ae70a3d7971454e7ef0abce84d24d688d..5996e6be23b5fe4d1845f46ea34965ada35422dd 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -54,9 +54,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 8a19fd0264c75072bd1ae1dae6df375e63cb3dc7..faff0edba042b2976c9fca21ec5fb09a0d8d6bca 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 2360fb6677cf0d10a414b6516112e54c9084861d..ab10aab8d47e9359e9ca395e28d2315aef190f62 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -58,9 +58,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         fvVectorMatrix divR = turbulence->divDevReff(U);
@@ -145,7 +144,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index 94d8f4acd4d3b60731369a04414b2bf903750664..009a30016164a37f65379807f68f3a20b43f605d 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -149,7 +148,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index d8c549668f58a523b6456fde6005c290025e88e9..9ac6bd4fa6fcacb849ab033471623d499e978b52 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -108,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index f949b39cfc614e2706fc897eda5a5b56686a494c..c5d2b0576c6e2acd547a1d2abf6bd94cf249964d 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -111,7 +110,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
index aee117ab6e629c850ea7c6642bc488c2d2f867ed..b705d2bbb764d4d4ff245707a340168c59b8e12c 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 95b4bc0843c2b1e488d42a1dda73f6a48554e0c4..555e6e0cfec9f051ce226f094186e1463c989ed3 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -139,7 +138,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 4b9c23118070f37851e2c0b3f489ef9957ed6290..162d81ddaab17ec7087b5121d9a076b7bdf0f538 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index ec0515aa19e9fc5a1232720d37797ec430b20a91..b5ac02c563c533dfb80b50e4afb1cab762f1b59d 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -78,7 +77,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 8d61f2ebe75213e603d1383aa2db29f5411211e9..a124288dc5b64961f7dd48742525216ac3a2e39c 100644
--- a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info << "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 
         nAveragingSteps++;
 
@@ -82,5 +81,5 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
index a1c13246e3d447256c5b0589092332a94cd83b3f..287065754e39c115a4c9b3a5a04e61faf631c332 100644
--- a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
     Info << "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 
         nAveragingSteps++;
 
@@ -78,5 +77,5 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 4a6f845fd89c6d109ccf81e4d5e8c57ceb1933a4..66df8cfb9f260d31d788d24f20819ee5ed208629 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readBubbleFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 81bceab2e584096b8f8dc4316499fe8c44829f66..12a8f4d49991b3e8f280bcef7f3274f05498a921 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 5696f9420e2111ad91e51a8b44b3e925159af67e..65afde39c2dedd071b59d6dd39880e18880e486d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index bfac075aece7e2e0b7da57f2e61748aa659b81bf..ff5a66912384e81d4246a0d5d36d9d932fd992f9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 8f55efd8decfd5b3d22191c022ebd23560cd2c6d..0386e6625ccb3f2092bdf25f81e90aac826178ae 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 512086c9b523aabf840e8c313c0e1fae4ac55bae..7d2048037a491544282087f85c5a1d2a37940a80 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index e2040bc107388e6538e0b62a9d58a31c1c5f8fe9..d50dcc0b0e912f3162db5966108ccc7bf29a0337 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 25a77af89d176da8c117510d09fdf5216bec5a6a..d0626cbf05bb63a643f0ad4a14fb1849647feb5c 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index a43dd5408b7c623745dfc6a2a4c8483b521f013e..ad8dbe3646cf2deb96e6affbdf75d155f2c90d37 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -93,7 +92,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index dbc8b2774f5588f1571c6b83c1fffc8fb7bbb47e..be8eea9061b53547c198af1926c121f3700f0eef 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -87,7 +86,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 6bc7f9738b435d7b797b9b44ecfe71142fec65dd..ce3fb2aa551eeb45011a373277d6d8e169c01b7e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index afa3c6600103181b52dee6512e480b67fa3b46a9..4574ef7f1c5cc46bf4ddbee646b4f8ed4eb9e003 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating displacement field\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration: " << runTime.value() << nl << endl;
 
 #       include "readSolidDisplacementFoamControls.H"
@@ -133,7 +132,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index 00a98b25310c2d3fb7813c944ebdb9c78d971450..4c14b00cc6100a14181a6f5edd2211b0bd609657 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating displacement field\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration: " << runTime.value() << nl << endl;
 
 #       include "readSteadyStressFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/Gstream/GsTest.C b/applications/test/Gstream/GsTest.C
index 8589674e702f73c32c0e72377bc307544a08f03d..61e3581ae5d6f8fa196d4a4bfe0dd60f2a6aa610 100644
--- a/applications/test/Gstream/GsTest.C
+++ b/applications/test/Gstream/GsTest.C
@@ -43,5 +43,5 @@ int main()
 
     } while (wind.waitForEvent());
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 729bc593295b49cf38f391af7286e67bc196acfd..4e9ab70b0c6deee130b6a8997417539eaaa2eedc 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -143,7 +142,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/MapTest.C
index f382803c5b82cde23368fc4e2cfbb59a52b20896..7fb05e76a517146a116e45c6cd207e3a19863507 100644
--- a/applications/test/Map/MapTest.C
+++ b/applications/test/Map/MapTest.C
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/testDataEntry.C
index ed6cd4ce8242b1e67d2027d49ecf044a6da98ca6..7a7dd94552d3b82431d2fc9ae9a3c68b82d862d4 100644
--- a/applications/test/dataEntry/testDataEntry.C
+++ b/applications/test/dataEntry/testDataEntry.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
         << "    int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
         << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/graphXi/graphXi.C b/applications/test/graphXi/graphXi.C
index e366cdc3a45d3fab0b868d6f4f9bdca665bb5c19..2c3a5750f37d9ab090b5287fbbd6029c1124e94c 100644
--- a/applications/test/graphXi/graphXi.C
+++ b/applications/test/graphXi/graphXi.C
@@ -60,7 +60,7 @@ int main()
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/maxMem/maxMem.C b/applications/test/maxMem/maxMem.C
index 0a43faa157d9ed6532509bda9003376d3f486ea3..590c542ee95d62b6ea404ba5cc2aa62f7feb7dce 100644
--- a/applications/test/maxMem/maxMem.C
+++ b/applications/test/maxMem/maxMem.C
@@ -28,5 +28,5 @@ int main(int argc, char *argv[])
         cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
     }
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index 304cdba3d6560da29ebc360cb28e819070da2518..8666e0905c8efc2fba9c84db8a60bc0e35ed2262 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -120,9 +120,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
 
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/parallelTest.C
index 953870c8e9219624374283a1c53b63ed303688e5..bf8440ece62a6e1ac7d488ae8db434c6d08f90ae 100644
--- a/applications/test/parallel/parallelTest.C
+++ b/applications/test/parallel/parallelTest.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/pointField/testPointField.C b/applications/test/pointField/testPointField.C
index 4f9f3cede6ea5d6c47d7029647808075dfeb2e43..8087dbaa484930ca9e3b365f1c590eae01f82945 100644
--- a/applications/test/pointField/testPointField.C
+++ b/applications/test/pointField/testPointField.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/slicedField/slicedFieldTest.C b/applications/test/slicedField/slicedFieldTest.C
index 12779c7d92ef94664d662c36d9a463a5706a5269..a82b4ac71298032c02073b84fc4f86c6eee13b23 100644
--- a/applications/test/slicedField/slicedFieldTest.C
+++ b/applications/test/slicedField/slicedFieldTest.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< Sf << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
index e6a62d4d3f360a480b523736f25ea0655b5e7f0c..17c85c1bb60884ea73453a69e09aa805e4ae1ff9 100644
--- a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
+++ b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
     Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/symmTensorField/symmTensorFieldTest.C b/applications/test/symmTensorField/symmTensorFieldTest.C
index f3b6757d032093c6662f7c8124f2e58d1d7fe0c5..c98b8dc4764085db464a1752d5558672b0dc9183 100644
--- a/applications/test/symmTensorField/symmTensorFieldTest.C
+++ b/applications/test/symmTensorField/symmTensorFieldTest.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
     Info<< symm(tf1) << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/tensor/tensorTest.C b/applications/test/tensor/tensorTest.C
index 4530bc7657919f8ceab844537c225a9931bd55a4..efc7824dd6577151973afda3a65e028ae323fb3e 100644
--- a/applications/test/tensor/tensorTest.C
+++ b/applications/test/tensor/tensorTest.C
@@ -65,5 +65,5 @@ int main()
     Info<< (symm(t7) && t7) - (0.5*(t7 + t7.T()) && t7) << endl;
     Info<< (t7 && symm(t7)) - (t7 && 0.5*(t7 + t7.T())) << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/triTet/triTet.C b/applications/test/triTet/triTet.C
index 53b9cd1399e08a3f528607d886a61e26632679fb..5c850a4377ed9fc299af4fa4042f6fdf109f2e07 100644
--- a/applications/test/triTet/triTet.C
+++ b/applications/test/triTet/triTet.C
@@ -36,5 +36,5 @@ int main()
     Info<< "tet circumRadius = "
         << tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/volField/volFieldTest.C b/applications/test/volField/volFieldTest.C
index e72cc87c98d9f503e28f7a0aba614b46daf1c893..3b7dafef8e4fd17d291874d5bce44d90cc297295 100644
--- a/applications/test/volField/volFieldTest.C
+++ b/applications/test/volField/volFieldTest.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st));
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/volPointInterpolation/volPointInterpolationTest.C b/applications/test/volPointInterpolation/volPointInterpolationTest.C
index d222b1452519d8e53dacb44283d18bca04de2e7d..07329ac3492d5978538c2ad4a49241970f4ce866 100644
--- a/applications/test/volPointInterpolation/volPointInterpolationTest.C
+++ b/applications/test/volPointInterpolation/volPointInterpolationTest.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     pointVectorField pU(pInterp.interpolate(U));
     pU.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
index 78a0b779dc44aec63836e19f98cfd8003cc256ec..c90594ff24ce90d46bb254e3ab40092437fb3054 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
+++ b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
index 0542bab893e7b10129b6bcbab53a6460923c71fc..5ce860640d4ba212db7c55db684fd8ce2f0fccf1 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
index d9fbec878575dbe93629d3f06c1c7a50186748cf..5810d64ca783a3f97f1c690ff648d025801f9cf5 100644
--- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
+++ b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
index d9d18722e67bf26a7ea68cfb123a8de80251a659..b1e1395bda026c9b727397af2940c97d37581d0b 100644
--- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
+++ b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index dade6a0e45552d23bf1537f5fb82afc2086474fe..d676581a576f2d47c6fbce09de18a0d9dd96a8ab 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "End" << nl << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
index 92d718f085e6266136ebfebfb235ffd10d77e2f1..2f7d9c89803261af1b70735996c97db74aa0c0f0 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "End" << nl << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1fab34ce947262c212f8a7214791bc39dcf102d6..706866bd2a1df6def0525cd0b00366edeec313c7 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -435,7 +435,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index 1f9a898d4317582923d7ca61dcbe70de876fb17c..52e0f2ae56ae8c0796890da6c7c17181c7500db6 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 21e0d7c1cc8cd594c45b6713fe5a6dcc15ac81f5..74ab53432af98dd691cb6aab1a89cf18a597b486 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index d05cd1a0e2f863447f05e4ca7432ae52a90bc9e3..7b64177da576620e81160feeed77606f5a2b0dc6 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 92bf820c3e2441e4ee9e4955e9c3099b13c34af0..998929c3b063b6f1f8fe61775c141e2de3842eea 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
     Info << "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 7f694438e97530cb93f88202adccfd84be9c3151..f883c3138b31d87e6898a067d8375f9429b0a1b5 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 64d65e3affa927e4e3f77d5395106fbfb728a4d4..e024ecda58f504ff8aadc62e25128cc02d1c7c97 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
         mesh.update();
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
index a10782b553c5b4b9c94674a2473e248b3c53780c..c47fa9ec17446408df734fc7b0dad237a6c2afc8 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.theta() << " CA-deg\n" << endl;
 
         mesh.move();
@@ -63,7 +62,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index 82e6e45a752293648cabf0a845e0117e9f5c419e..d590763229350fc9ad9bb4b17a0a9ae7aade7050 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
 
     autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
         mesh.movePoints(motionPtr->newPoints());
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 4b50082e1049fe97e780345c26bbab3a63095a4f..f9bd650d1541f67cd7d2ed6e6980a0aebb68482e 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
     Info << "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
index 179ff05bf930496f0dc4a7e3778451bf25931439..d134767702c59c61937cdf503759e7e80b346223 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index a7328cb48737d06d58b992c8885033b7e1d903dc..fff19e006d6f36cc223b84fa36e98ae6493dd2ea 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -723,7 +723,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEnd.\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
index b6acc7806ff2bba46c58175a63a19850d3452718..34ebbc75dcab101e2d95655ba63dc0a3002b0de0 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
     Info << "Vmax/Vmin = " << Vmax/Vmin << endl;
     Info << "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 6d09449696ed6cb335c5e9eff89fbdcfbdaabe30..bb41fb60d46bfaf18ba6fa32bbe5c5d13f310bc2 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index 4ae3b13ac9424424c7f588490bc364ebc1298503..79f23de3e790b0818cd45de8a847dc59d951f736 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
         wdot.write();
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 14e722f621e717d7899309828771d7328561ca84..6729389218f5ab7d2183eb622e8569451e8cf6bb 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
index 723250e3cc36b8227b81b2f0d27d114daf2d2d2a..2c481b89278566272af3de09f3b39e69fba0db47 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
+++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 65cbcc94e89d4d04daa31e2ebb5efb271f834247..3beeb7087822ddc64d2846f0a511837b88bdb41a 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 345548b9d2cbe11efbb8b9652db90a621d5eb01f..5e15aff046e3b2e56a336d465d86072a8268ba15 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEnd\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index f904d1f899bbb1e38c3c8d89d916ac4a9b7c9257..dac7cd03934ada77c1c586b0320d5cdf4a301aaf 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 03e3f77affdd1549dcc50d835c111a8425f9a1ff..32ae05fa6ca632b0b7227c6f737084365294a5c2 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 6009a08575a1c9ec395c0024c748a70dd9900a40..e9171c330cc9d0b1de233c100273347e5f57bb4e 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
     Info << "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 0e294be6472c10489c0a4a08de38b10477cdb7ef..e893520b065b4ab1d6f9573ef330fd06f7868d22 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 8d8b9f5e6ee407897ff50717bc2b9de81f023cef..c2186b642df5c6fbbdb1a0d52d0b38b5b82d515a 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 8b65251fd905fc278976afc2ce4d7caab2778e1b..277a4e787fbbf40809c8b1ca53d01724f4db2baa 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     Info << "Adiabatic flame temperature of mixture " << rMix.name() << " = "
          << products.TH(reactants.H(T0), 1000.0) << " K" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/src/OpenFOAM/primitives/random/random.c b/src/OpenFOAM/primitives/random/random.c
index 71273fc485509383a5c3337b82f043b4be80b18b..5421390cf0ca197a92acf27a8cbd3d7df5e96a8c 100644
--- a/src/OpenFOAM/primitives/random/random.c
+++ b/src/OpenFOAM/primitives/random/random.c
@@ -248,7 +248,7 @@ initstate(seed, arg_state, n)
 	if (n < BREAK_0) {
 		(void)fprintf(stderr,
 		    "random: not enough state (%d bytes); ignored.\n", n);
-		return(0);
+		return 0;
 	}
 	if (n < BREAK_1) {
 		rand_type = TYPE_0;
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index e45d47eb2638663e77a5c5b65bb7994217282db2..f9f34b9c058d81c2a6f3242d068685a800bb0e93 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -45,7 +45,7 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     fieldAverage1
     {
         // Type of functionObject
@@ -54,23 +54,24 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libfieldAverage.so");
 
-        // Fields to be  averaged - runTime modifiable
+        // Fields to be averaged - runTime modifiable
         fields
         (
             U
             {
-                mean            on;
-                prime2Mean      on;
-                base            time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
+
             p
             {
-                mean            on;
-                prime2Mean      on;
-                base            time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 // ************************************************************************* //
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 0028a30b5be90fecb4ea752ee4846c78b323114d..1082636303c6891d00c76806b9d085de7b097980 100644
--- a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
index 2b862843f00af05dfdd4dcba454324e52cf90157..5c3b671271f41f36e8c0091c32a7a2e8d88efc3c 100644
--- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
+++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 0d13ac7ba5cb7b3ddfef7b359158d43aa4a48751..bc4e09f51486db05f98991d49e84c9cc63884c6d 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep  yes;
 maxCo           0.5;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 693d3e125f66bb762c33e86168803fc21cb8c0fd..c507917d6c2648087533932c3af7f2d00cb22983 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep  yes;
 maxCo           0.5;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index c211c964aefdc8369964f2503d0b64a66cd65771..3fccde63c416efaafddf2adccc5be6395acb5501 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -44,31 +44,31 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index 2fe2edf6fac8ee8491494075962c4930ba5bb3af..ce2e9218c9147050f7603bc262f792b96c0dd5d6 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -43,7 +43,26 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-functions       ( forces { type forceCoeffs ; functionObjectLibs ( "libforces.so" ) ; patches ( WALL10 ) ; pName p ; UName U ; log true ; rhoInf 1 ; CofR ( 0 0 0 ) ; liftDir ( -0.239733 0.970839 0 ) ; dragDir ( 0.970839 0.239733 0 ) ; pitchAxis ( 0 0 1 ) ; magUInf 618.022 ; lRef 1 ; Aref 1 ; } );
+functions
+{
+    forces
+    {
+        type        forceCoeffs;
+        functionObjectLibs ( "libforces.so" );
+        patches     ( WALL10 );
+        pName       p;
+        UName       U;
+        log         true;
+        rhoInf      1;
+        CofR        ( 0 0 0 );
+        liftDir     ( -0.239733 0.970839 0 );
+        dragDir     ( 0.970839 0.239733 0 );
+        pitchAxis   ( 0 0 1 );
+        magUInf     618.022;
+        lRef        1;
+        Aref        1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
index 7a039df40dc41e7db22f185eeadb203b8049b3c9..aca68d4e1f1f1140d76bf48f906f9f72322b0481 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
@@ -88,7 +88,7 @@ forAll(Tpatches, patchI)
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 }
diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index 9fc36826fe69d29b6164386dc74e19eb6b5df6ff..004a92b45f5c92a81fc537e826508bc7b82bfee0 100644
--- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 2ca28c29a1150383756dc56581f73663dd918fa9..7af5dca9b624608953228c685e2652496676b99d 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -43,7 +43,32 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-functions       ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; enabled true ; outputControl outputTime ; fields ( U { mean on ; prime2Mean on ; base time ; } p { mean on ; prime2Mean on ; base time ; } ) ; } );
+functions
+{
+    fieldAverage1
+    {
+        type            fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        enabled         true;
+        outputControl   outputTime;
+        fields
+        (
+            U
+            {
+                mean        on;
+                prime2Mean  on;
+                base        time;
+            }
+
+            p
+            {
+                mean        on;
+                prime2Mean  on;
+                base        time;
+            }
+        );
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index e312fcb839f09a63570876e37965f1e6b39028a0..a5ba827eec16c5ec76ce494560e118be21230596 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -47,7 +47,23 @@ adjustTimeStep  yes;
 
 maxCo           5;
 
-functions       ( probes { type probes ; functionObjectLibs ( "libsampling.so" ) ; name probes ; probeLocations ( ( 1e-06 0 0.01 ) ( 0.21 -0.20999 0.01 ) ( 0.21 0.20999 0.01 ) ( 0.21 0 0.01 ) ) ; fields ( p U ) ; } );
+functions
+{
+    probes
+    {
+        type        probes;
+        name        probes;
+        functionObjectLibs ( "libsampling.so" );
+        probeLocations
+        (
+            ( 1e-06 0 0.01 )
+            ( 0.21 -0.20999 0.01 )
+            ( 0.21 0.20999 0.01 )
+            ( 0.21 0 0.01 )
+        );
+        fields ( p U );
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index ba9c0f1c408ade3c92b46328d6431f481f78ed8f..a4b46af8cc2395df65cbc26f6c14c80644627263 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -44,14 +44,14 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     probes1
     {
-        type probes;
+        type            probes;
         functionObjectLibs ( "libsampling.so" );
-        enabled true;
-        outputControl timeStep;
-        outputInterval 1;
+        enabled         true;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -71,28 +71,28 @@ functions
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index 2f1e1a9074d1bb120bb6e322598ac641b536ce64..4f36f59c28132725f3c27b88707564e85a33953b 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -44,14 +44,14 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     probes1
     {
-        type probes;
+        type            probes;
         functionObjectLibs ( "libsampling.so" );
-        enabled true;
-        outputControl timeStep;
-        outputInterval 1;
+        enabled         true;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -70,28 +70,28 @@ functions
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index fecc4cb717f8fd676b00c1a1be15720d0f4f065f..e0cc1cef1ad1699a71fd6a6d369842a4fc7c15a7 100644
--- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 073ada6caa4135e14a0734304802d068a2d2b87a..2ba1fabc2b00b9a856324aba63d08016de93ae9e 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -48,38 +48,38 @@ maxCo           0.5;
 maxAcousticCo   50;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled false;
-        outputControl outputTime;
+        enabled         false;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             gamma
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 0b3c87648677c77cd65dbecb5951ab982b360f6a..c87d60631d3402efb8ee50d18d827532363381cd 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -48,38 +48,38 @@ maxCo           0.5;
 maxAcousticCo   50;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled false;
-        outputControl outputTime;
+        enabled         false;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean off;
-                base time ;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             gamma
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
index f533a54408a008a373e38f555a3d71a7e37b351b..e4a69588f6ea514229a8f1616348508e27a1bc41 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
 
     wallPressure
     {
-        type surfaces;
+        type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        outputControl timeStep;
-        outputInterval 10;
-        surfaceFormat raw;
+        outputControl   timeStep;
+        outputInterval  10;
+        surfaceFormat   raw;
         fields
         (
             p
@@ -84,13 +84,13 @@ functions
         (
             walls
             {
-                type patch;
-                patchName walls;
+                type        patch;
+                patchName   walls;
                 triangulate false;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
index a4e44f2de3153e8998fc44a13ff9793f9a52e513..9fe32ebf04f0d1b348307f1cf0ffe4a73e64f771 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 10;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  10;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
 
     wallPressure
     {
-        type surfaces;
+        type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        outputControl timeStep;
-        outputInterval 10;
-        surfaceFormat raw;
+        outputControl   timeStep;
+        outputInterval  10;
+        surfaceFormat   raw;
         fields
         (
             p
@@ -83,13 +83,13 @@ functions
         (
             walls
             {
-                type patch;
-                patchName walls;
+                type        patch;
+                patchName   walls;
                 triangulate false;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
index 1b122632d3a10a68a5acb3c0a015f737076e0fcf..5823d9fbbdacda8d5222d8b733eb21dff764b9a9 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
index 1b122632d3a10a68a5acb3c0a015f737076e0fcf..5823d9fbbdacda8d5222d8b733eb21dff764b9a9 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
index 1b122632d3a10a68a5acb3c0a015f737076e0fcf..5823d9fbbdacda8d5222d8b733eb21dff764b9a9 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 766cb8759599c14c35ac8a001d02aeeeb71684aa..8fc8f2766906b4b13b096da89d48058623600812 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index e4d35359ada3e29b1e1dc0d7db8658c0664278dc..d5eaba87fe379a70d560e14b9722d6ff0f0490bb 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.9;
 maxDeltaT       1e-05;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index d0f78bb5059ae0162712f1cc913a6ad02608881d..1b724308f141a1d6676dbce6c782a24fabd6b883 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //