diff --git a/etc/controlDict b/etc/controlDict
index cfbdf69cb8..6fa473e688 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -913,60 +913,60 @@ DimensionedConstants
     {
         universal
         {
-            c               c [ 0 1 -1 0 0 0 0 ] 2.99792e+08;
-            G               G [ -1 3 -2 0 0 0 0 ] 6.67429e-11;
-            h               h [ 1 2 -1 0 0 0 0 ] 6.62607e-34;
+            c               c [0 1 -1 0 0 0 0] 2.99792e+08;
+            G               G [-1 3 -2 0 0 0 0] 6.67429e-11;
+            h               h [1 2 -1 0 0 0 0] 6.62607e-34;
         }
         electromagnetic
         {
-            e               e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
+            e               e [0 0 1 0 0 1 0] 1.60218e-19;
         }
         atomic
         {
-            me              me [ 1 0 0 0 0 0 0 ] 9.10938e-31;
-            mp              mp [ 1 0 0 0 0 0 0 ] 1.67262e-27;
+            me              me [1 0 0 0 0 0 0] 9.10938e-31;
+            mp              mp [1 0 0 0 0 0 0] 1.67262e-27;
         }
         physicoChemical
         {
-            mu              mu [ 1 0 0 0 0 0 0 ] 1.66054e-27;
-            k               k [ 1 2 -2 -1 0 0 0 ] 1.38065e-23;
+            mu              mu [1 0 0 0 0 0 0] 1.66054e-27;
+            k               k [1 2 -2 -1 0 0 0] 1.38065e-23;
         }
         standard
         {
             //- Standard pressure [Pa]
-            Pstd            Pstd [ 1 -1 -2 0 0 0 0 ] 100000;
+            Pstd            Pstd [1 -1 -2 0 0 0 0] 1e5;
             //- Standard temperature [degK]
-            Tstd            Tstd [ 0 0 0 1 0 0 0 ] 298.15;
+            Tstd            Tstd [0 0 0 1 0 0 0] 298.15;
         }
     }
     USCSCoeffs
     {
         universal
         {
-            c               c [ 0 1 -1 0 0 0 0 ] 9.83558e+08;
-            G               G [ -1 3 -2 0 0 0 0 ] 1.06909e-09;
-            h               h [ 1 2 -1 0 0 0 0 ] 1.57234e-32;
+            c               c [0 1 -1 0 0 0 0] 9.83558e+08;
+            G               G [-1 3 -2 0 0 0 0] 1.06909e-09;
+            h               h [1 2 -1 0 0 0 0] 1.57234e-32;
         }
         electromagnetic
         {
-            e               e [ 0 0 1 0 0 1 0 ] 1.60218e-19;
+            e               e [0 0 1 0 0 1 0] 1.60218e-19;
         }
         atomic
         {
-            me              me [ 1 0 0 0 0 0 0 ] 2.00825e-30;
-            mp              mp [ 1 0 0 0 0 0 0 ] 3.68746e-27;
+            me              me [1 0 0 0 0 0 0] 2.00825e-30;
+            mp              mp [1 0 0 0 0 0 0] 3.68746e-27;
         }
         physicoChemical
         {
-            mu              mu [ 1 0 0 0 0 0 0 ] 3.66083e-27;
-            k               k [ 1 2 -2 -1 0 0 0 ] 1.82012e-22;
+            mu              mu [1 0 0 0 0 0 0] 3.66083e-27;
+            k               k [1 2 -2 -1 0 0 0] 1.82012e-22;
         }
         standard
         {
             //- Standard pressure [lbm/ft^2]
-            Pstd            Pstd [ 1 -1 -2 0 0 0 0 ] 2088.6;
+            Pstd            Pstd [1 -1 -2 0 0 0 0] 2088.6;
             //- Standard temperature [degR]
-            Tstd            Tstd [ 0 0 0 1 0 0 0 ] 536.67;
+            Tstd            Tstd [0 0 0 1 0 0 0] 536.67;
         }
     }
 }
@@ -979,34 +979,34 @@ DimensionSets
     SICoeffs
     {
         // Basic units
-        kg  kg  [ 1 0 0 0 0 0 0 ] 1.0;
-        m   m   [ 0 1 0 0 0 0 0 ] 1.0;
-        s   s   [ 0 0 1 0 0 0 0 ] 1.0;
-        K   K   [ 0 0 0 1 0 0 0 ] 1.0;
-        mol mol [ 0 0 0 0 1 0 0 ] 1.0;
-        A   A   [ 0 0 0 0 0 1 0 ] 1.0;
-        Cd  Cd  [ 0 0 0 0 0 0 1 ] 1.0;
+        kg  kg  [1 0 0 0 0 0 0] 1.0;
+        m   m   [0 1 0 0 0 0 0] 1.0;
+        s   s   [0 0 1 0 0 0 0] 1.0;
+        K   K   [0 0 0 1 0 0 0] 1.0;
+        mol mol [0 0 0 0 1 0 0] 1.0;
+        A   A   [0 0 0 0 0 1 0] 1.0;
+        Cd  Cd  [0 0 0 0 0 0 1] 1.0;
 
         // Derived units
-        Hz  Hz  [ s^-1 ] 1.0;
-        N   N   [ kg m s^-2 ] 1.0;
-        Pa  Pa  [ N m^-2 ] 1.0;
-        J   J   [ N m ] 1.0;
-        W   W   [ J s^-1 ] 1.0;
+        Hz  Hz  [s^-1] 1.0;
+        N   N   [kg m s^-2] 1.0;
+        Pa  Pa  [N m^-2] 1.0;
+        J   J   [N m] 1.0;
+        W   W   [J s^-1] 1.0;
 
         // Some non-symbolic ones
         area area [m^2] 1.0;
         volume volume [m^3] 1.0;
-        density density [ kg m^-3 ] 1.0;
-        acceleration acceleration  [ m s^-2 ] 1.0;
-        kinematicPressure kinematicPressure [ Pa density^-1 ] 1.0;
+        density density [kg m^-3] 1.0;
+        acceleration acceleration  [m s^-2] 1.0;
+        kinematicPressure kinematicPressure [Pa density^-1] 1.0;
 
         // Scaled units. Only allowed in dimensionedType (dimensionedScalar,
         // dimensionedVector etc.) and UniformDimensionedField, not
         // in DimensionedField or GeometricField
-        cm  cm  [ m ] 1e-2;
-        mm  mm  [ m ] 1e-3;
-        km  km  [ m ] 1e3;
+        cm  cm  [m] 1e-2;
+        mm  mm  [m] 1e-3;
+        km  km  [m] 1e3;
 
         // Set of units used for printing. Can be any basic or derived
         // but not scaled (only supported for dimensionedScalar, etc)
@@ -1016,13 +1016,13 @@ DimensionSets
     USCSCoeffs
     {
         // Basic units
-        lb  lb  [ 1 0 0 0 0 0 0 ] 1.0;
-        ft  ft  [ 0 1 0 0 0 0 0 ] 1.0;
-        s   s   [ 0 0 1 0 0 0 0 ] 1.0;
-        R   R   [ 0 0 0 1 0 0 0 ] 1.0;
-        mol mol [ 0 0 0 0 1 0 0 ] 1.0;
-        A   A   [ 0 0 0 0 0 1 0 ] 1.0;
-        Cd  Cd  [ 0 0 0 0 0 0 1 ] 1.0;
+        lb  lb  [1 0 0 0 0 0 0] 1.0;
+        ft  ft  [0 1 0 0 0 0 0] 1.0;
+        s   s   [0 0 1 0 0 0 0] 1.0;
+        R   R   [0 0 0 1 0 0 0] 1.0;
+        mol mol [0 0 0 0 1 0 0] 1.0;
+        A   A   [0 0 0 0 0 1 0] 1.0;
+        Cd  Cd  [0 0 0 0 0 0 1] 1.0;
 
         // Set of units used for printing. Can be any basic or derived
         // but not scaled (only supported for dimensionedScalar, etc)