diff --git a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
index 7c89031cf0..a9dc94d31a 100644
--- a/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H
@@ -102,9 +102,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatch${FieldType} > clone() const
+        virtual tmp<fvPatch${FieldType}> clone() const
         {
-            return tmp<fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType}>
             (
                 new ${typeName}FixedValueFvPatch${FieldType}(*this)
             );
@@ -118,12 +118,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatch${FieldType} > clone
+        virtual tmp<fvPatch${FieldType}> clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp<fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType}>
             (
                 new ${typeName}FixedValueFvPatch${FieldType}(*this, iF)
             );
diff --git a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
index 3b9f128f57..4b872aeeee 100644
--- a/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
+++ b/etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H
@@ -102,9 +102,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatch${FieldType} > clone() const
+        virtual tmp<fvPatch${FieldType}> clone() const
         {
-            return tmp<fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType}>
             (
                 new ${typeName}MixedValueFvPatch${FieldType}(*this)
             );
@@ -118,12 +118,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatch${FieldType} > clone
+        virtual tmp<fvPatch${FieldType}> clone
         (
             const DimensionedField<${TemplateType}, volMesh>& iF
         ) const
         {
-            return tmp<fvPatch${FieldType} >
+            return tmp<fvPatch${FieldType}>
             (
                 new ${typeName}MixedValueFvPatch${FieldType}(*this, iF)
             );
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index a89e18211c..63cb178ff1 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -293,18 +293,13 @@ Foam::tmp<Foam::Field<Foam::solveScalar>> Foam::lduMatrix::residual
 }
 
 
-Foam::tmp<Foam::scalarField > Foam::lduMatrix::H1() const
+Foam::tmp<Foam::scalarField> Foam::lduMatrix::H1() const
 {
-    tmp<scalarField > tH1
-    (
-        new scalarField(lduAddr().size(), Zero)
-    );
+    auto tH1 = tmp<scalarField>::New(lduAddr().size(), Zero);
 
     if (lowerPtr_ || upperPtr_)
     {
-        scalarField& H1_ = tH1.ref();
-
-        scalar* __restrict__ H1Ptr = H1_.begin();
+        scalar* __restrict__ H1Ptr = tH1.ref().begin();
 
         const label* __restrict__ uPtr = lduAddr().upperAddr().begin();
         const label* __restrict__ lPtr = lduAddr().lowerAddr().begin();
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
index cb42dab10d..5a550281c6 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
@@ -73,7 +73,7 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone
 
     // Functional form of the porosity surface area per unit volume as a
     // function of the normalized vertical position
-    autoPtr<Function1<scalar >> SigmaFunc
+    autoPtr<Function1<scalar>> SigmaFunc
     (
         Function1<scalar>::New("Sigma", dict)
     );
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
index 1d5c766d92..bec4e9bfa6 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
@@ -141,7 +141,7 @@ public:
 // * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * * //
 
 template<>
-tmp<scalarField > basicSymmetryFvPatchField<scalar>::snGrad() const;
+tmp<scalarField> basicSymmetryFvPatchField<scalar>::snGrad() const;
 
 template<>
 void basicSymmetryFvPatchField<scalar>::evaluate
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
index 845d13c24c..1e83ec8992 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
@@ -157,7 +157,7 @@ public:
 // * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * * //
 
 template<>
-tmp<scalarField > wedgeFvPatchField<scalar>::snGrad() const;
+tmp<scalarField> wedgeFvPatchField<scalar>::snGrad() const;
 
 template<>
 void wedgeFvPatchField<scalar>::evaluate
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H
index 8a1c630da6..7ad29826eb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/interfaceCompression/interfaceCompressionFvPatchScalarField.H
@@ -107,7 +107,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchScalarField> clone() const
         {
-            return tmp<fvPatchScalarField >
+            return tmp<fvPatchScalarField>
             (
                 new interfaceCompressionFvPatchScalarField(*this)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
index d61cb380cb..892f9f45b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
@@ -158,7 +158,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchScalarField> clone() const
         {
-            return tmp<fvPatchScalarField >
+            return tmp<fvPatchScalarField>
             (
                 new phaseHydrostaticPressureFvPatchScalarField(*this)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
index 59f3df0b89..a2df25536e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghPressure/prghPressureFvPatchScalarField.H
@@ -145,7 +145,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchScalarField> clone() const
         {
-            return tmp<fvPatchScalarField >
+            return tmp<fvPatchScalarField>
             (
                 new prghPressureFvPatchScalarField(*this)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H
index 2abc004001..9f0028245a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.H
@@ -153,7 +153,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchScalarField> clone() const
         {
-            return tmp<fvPatchScalarField >
+            return tmp<fvPatchScalarField>
             (
                 new prghTotalHydrostaticPressureFvPatchScalarField(*this)
             );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
index 29f6790db8..47b2653037 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalPressure/prghTotalPressureFvPatchScalarField.H
@@ -156,7 +156,7 @@ public:
         //- Construct and return a clone
         virtual tmp<fvPatchScalarField> clone() const
         {
-            return tmp<fvPatchScalarField >
+            return tmp<fvPatchScalarField>
             (
                 new prghTotalPressureFvPatchScalarField(*this)
             );