diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index a6f960db6e76cb756f9e07e4248914fd025710dd..992ffd287aabf8b8fe99591a31e84e195141138f 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -50,7 +50,7 @@ Foam::Distribution<Type>::Distribution(const Type& binWidth)
 template<class Type>
 Foam::Distribution<Type>::Distribution(const Distribution<Type>& d)
 :
-    List<List<scalar>>(static_cast<const List<List<scalar>>& >(d)),
+    List<List<scalar>>(static_cast<const List<List<scalar>>&>(d)),
     binWidth_(d.binWidth()),
     listStarts_(d.listStarts())
 {}
@@ -603,7 +603,7 @@ Foam::Ostream& Foam::operator<<
     const Distribution<Type>& d
 )
 {
-    os  <<  static_cast<const List<List<scalar>>& >(d)
+    os  << static_cast<const List<List<scalar>>&>(d)
         << d.binWidth_ << token::SPACE
         << d.listStarts_;
 
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
index 77692890b3216362ed086740da3050d3aa1d89db..11fc0a0a44acf7135d419da3b204f4bdf48dfc5a 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
@@ -351,7 +351,7 @@ template<>
 const Foam::UPstream::commsStruct&
 Foam::UList<Foam::UPstream::commsStruct>::operator[](const label procID) const
 {
-    return const_cast<UList<UPstream::commsStruct>& >(*this).operator[](procID);
+    return const_cast<UList<UPstream::commsStruct>&>(*this).operator[](procID);
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
index 513efc44e50e948c97e44dfec9817939c4585be9..3cf47f0cd50cfe755a16235fcaaaa0c938abb475 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldReuseFunctions.H
@@ -42,7 +42,7 @@ tmp<DimensionedField<TypeR, GeoMesh>> New
 )
 {
     DimensionedField<TypeR, GeoMesh>& df1 =
-        const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+        const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
     if (tdf1.isTmp())
     {
@@ -115,7 +115,7 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
         if (tdf1.isTmp())
         {
@@ -192,7 +192,7 @@ public:
     {
         const DimensionedField<Type1, GeoMesh>& df1 = tdf1();
         DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
 
         if (tdf2.isTmp())
         {
@@ -235,7 +235,7 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
 
         if (tdf1.isTmp())
         {
@@ -278,9 +278,9 @@ public:
     )
     {
         DimensionedField<TypeR, GeoMesh>& df1 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf1());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf1());
         DimensionedField<TypeR, GeoMesh>& df2 =
-            const_cast<DimensionedField<TypeR, GeoMesh>& >(tdf2());
+            const_cast<DimensionedField<TypeR, GeoMesh>&>(tdf2());
 
         if (tdf1.isTmp())
         {
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
index a9c849c53a5a38862c7fff216f26c80affc5b726..c6fb56706d37bf0d928acfdf0485b6ed573276ec 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldReuseFunctions.H
@@ -85,7 +85,7 @@ tmp<GeometricField<TypeR, PatchField, GeoMesh>> New
 )
 {
     GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-        const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+        const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
     if (reusable(tgf1))
     {
@@ -171,7 +171,7 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
         if (reusable(tgf1))
         {
@@ -264,7 +264,7 @@ public:
     {
         const GeometricField<Type1, PatchField, GeoMesh>& gf1 = tgf1();
         GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
 
         if (reusable(tgf2))
         {
@@ -313,7 +313,7 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
 
         if (reusable(tgf1))
         {
@@ -356,9 +356,9 @@ public:
     )
     {
         GeometricField<TypeR, PatchField, GeoMesh>& gf1 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf1());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf1());
         GeometricField<TypeR, PatchField, GeoMesh>& gf2 =
-            const_cast<GeometricField<TypeR, PatchField, GeoMesh>& >(tgf2());
+            const_cast<GeometricField<TypeR, PatchField, GeoMesh>&>(tgf2());
 
         if (reusable(tgf1))
         {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
index 82d03af3107f728a770e52990763c1a00c92ea38..7e58126c4d41f7ec07003644c9ebef8439bbbb8d 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
@@ -1276,7 +1276,7 @@ void Foam::mapDistributeBase::distribute
 {
     fld.shrink();
 
-    List<T>& fldList = static_cast<List<T>& >(fld);
+    List<T>& fldList = static_cast<List<T>&>(fld);
 
     distribute(fldList, tag);
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 4f3133a038523f9e855ca9d6930a85eaf5884f61..e3cc9d68ff996dee1bb49d982c049a16706cd411 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -167,7 +167,7 @@ void Foam::mapDistribute::distribute
 {
     fld.shrink();
 
-    List<T>& fldList = static_cast<List<T>& >(fld);
+    List<T>& fldList = static_cast<List<T>&>(fld);
 
     distribute(fldList, dummyTransform, tag);
 
diff --git a/src/conversion/ccm/reader/ccmSolutionTable.H b/src/conversion/ccm/reader/ccmSolutionTable.H
index 1a58d67cc68e49c22399e2980d92c177f6cd6978..cf954872e53ba03210dfcfbc6ab09ee0d885fb85 100644
--- a/src/conversion/ccm/reader/ccmSolutionTable.H
+++ b/src/conversion/ccm/reader/ccmSolutionTable.H
@@ -414,7 +414,7 @@ public:
             const fieldTable& tbl
         )
         {
-            os  << static_cast<const namesList<fieldEntry>& >(tbl)
+            os  << static_cast<const namesList<fieldEntry>&>(tbl)
                 << nl
                 << "maxCell: "  << tbl.maxCellId()
                 << " maxFace: " << tbl.maxFaceId();
diff --git a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
index 439707ddff573824962e95f80a9f33a211e1642b..0fbd199b7b4c9419b1f237511c5da1fb079f3bd8 100644
--- a/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
+++ b/src/mesh/blockMesh/gradingDescriptor/gradingDescriptors.C
@@ -70,7 +70,7 @@ Foam::Istream& Foam::operator>>(Istream& is, gradingDescriptors& gds)
         is.putBack(t);
 
         // Read the list for gradingDescriptors
-        is >> static_cast<List<gradingDescriptor>& >(gds);
+        is >> static_cast<List<gradingDescriptor>&>(gds);
 
         // Check state of Istream
         is.check(FUNCTION_NAME);
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 763a6b4886bdbfe60732fb8002318ec8a5318407..aa12edffeef9d64a8a0ad164c45cd488c2dc4481 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -38,7 +38,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
 {
     if (isA<singleStepReactingMixture<ThermoType>>(thermo))
     {
-        return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+        return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
         (
             thermo
         );
@@ -50,7 +50,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::checkThermo
             << "Please select a thermo package based on "
             << "singleStepReactingMixture" << exit(FatalError);
 
-        return dynamic_cast<const singleStepReactingMixture<ThermoType>& >
+        return dynamic_cast<const singleStepReactingMixture<ThermoType>&>
         (
             thermo
         );
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index a389e33b0808e780c696892a45b4d442c4b5fb99..12fd3462b48a968cb8c001b83619083f547c1822 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -157,7 +157,7 @@ pyrolysisChemistryModel
     Info<< indent << "Number of gases = " << nGases_ << nl;
     forAll(this->reactions_, i)
     {
-        Info<< dynamic_cast<const solidReaction<SolidThermo>& >
+        Info<< dynamic_cast<const solidReaction<SolidThermo>&>
         (
             this->reactions_[i]
         ) << nl;
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
index 47664c4fc92b0fcf17e452edf53391aaeb5cb684..4a8d094133057677ba460442fb4e61b5161f6aee 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
@@ -41,14 +41,14 @@ solidChemistryModel
     Ys_(this->solidThermo().composition().Y()),
     reactions_
     (
-        dynamic_cast<const reactingMixture<SolidThermo>& >
+        dynamic_cast<const reactingMixture<SolidThermo>&>
         (
             this->solidThermo()
         )
     ),
     solidThermo_
     (
-        dynamic_cast<const reactingMixture<SolidThermo>& >
+        dynamic_cast<const reactingMixture<SolidThermo>&>
         (
             this->solidThermo()
         ).speciesData()
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index b8d21877b02b6da056c816ac4ac2ce225f8e8389..8dc32437e4f5700ab43a39f7535ef28b2d3d11a8 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -492,7 +492,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::updateCoeffs()
             scalarField liquidRho(patch().size(), 0.0);
 
             fixedGradientFvPatchField<scalar>& Yp =
-                const_cast<fixedGradientFvPatchField<scalar>& >
+                const_cast<fixedGradientFvPatchField<scalar>&>
                 (
                     refCast
                     <