diff --git a/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H b/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
index 49e783e199..b26d288801 100644
--- a/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
+++ b/applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
@@ -48,7 +48,7 @@ areaVectorField Us
 
 dimensioned<scalar> Uinf("Uinf", dimVelocity, 1.0);
 
-forAll (Us, faceI)
+forAll(Us, faceI)
 {
     Us[faceI].x() =
         Uinf.value()*(0.25*(3.0 + sqr(R[faceI].x()/mag(R[faceI]))) - 1.0);
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
index fac3a8f947..3ba6e82b72 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@@ -720,7 +720,7 @@ void Foam::radiation::laserDTRM::calculate()
         {
             const pointField& pos = positions[proci];
             const pointField& pfinal = p0[proci];
-            forAll (pos, i)
+            forAll(pos, i)
             {
                 meshTools::writeOBJ(osRef, pos[i]);
                 vertI++;
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index 97955b8d3d..6169380399 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -172,13 +172,12 @@ public:
 // Instantiation for multi-component (from) to single-component (to)
 #define makeInterfaceDispSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                             \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, OtherMix<OtherPhys> >                       \
+    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                        \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
-                                                                               \
     addInterfaceCompositionToRunTimeSelectionTable                             \
     (                                                                          \
         Type,                                                                  \
@@ -190,13 +189,12 @@ public:
 // Instantiation for single-component (from) to multi-component (to)
 #define makeInterfaceContSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, Mix<Phys> >                                           \
+    typedef Thermo<Comp, Mix<Phys>>                                            \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > >       \
+    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>         \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
-                                                                               \
     addInterfaceCompositionToRunTimeSelectionTable                             \
     (                                                                          \
         Type,                                                                  \
@@ -208,13 +206,12 @@ public:
 // Instantiation for single-component-single-component pairs
 #define makeInterfacePureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, Mix<Phys> >                                           \
+    typedef Thermo<Comp, Mix<Phys>>                                            \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, OtherMix<OtherPhys> >                       \
+    typedef OtherThermo<OtherComp, OtherMix<OtherPhys>>                        \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
-                                                                               \
     addInterfaceCompositionToRunTimeSelectionTable                             \
     (                                                                          \
         Type,                                                                  \
@@ -226,10 +223,10 @@ public:
 // Instantiation for multi-component-multi-component pairs
 #define makeSpecieInterfaceSpecieMixtures(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
                                                                                \
-    typedef Thermo<Comp, SpecieMixture<Mix<Phys> > >                           \
+    typedef Thermo<Comp, SpecieMixture<Mix<Phys>>>                             \
         Type##Thermo##Comp##Mix##Phys;                                         \
                                                                                \
-    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > >       \
+    typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>>         \
         Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys;              \
                                                                                \
     addInterfaceCompositionToRunTimeSelectionTable                             \
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index c3fb4fff94..adcaa816d6 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -202,7 +202,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
             // Note: In Fluent, all boundary faces point inwards, which is
             // opposite from the OpenFOAM convention.
             // Turn them around on printout
-            forAllReverse (l, lI)
+            forAllReverse(l, lI)
             {
                 fluentMeshFile << l[lI] + 1 << " ";
             }
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C
index 80d94f900c..d13e2455e3 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C
@@ -44,7 +44,7 @@ faFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
     sizeBeforeMapping_(sizeBeforeMapping),
     directAddressing_(addressingSlice)
 {
-    forAll (directAddressing_, i)
+    forAll(directAddressing_, i)
     {
         // Subtract one to align addressing.
         // directAddressing_[i] -= addressingOffset + 1;
@@ -69,7 +69,7 @@ processorAreaPatchFieldDecomposer
     const labelList& own = mesh.edgeOwner();
     const labelList& neighb = mesh.edgeNeighbour();
 
-    forAll (addressing_, i)
+    forAll(addressing_, i)
     {
         // Subtract one to align addressing.
         label ai = addressingSlice[i];
@@ -119,7 +119,7 @@ processorEdgePatchFieldDecomposer
     addressing_(addressingSlice.size()),
     weights_(addressingSlice.size())
 {
-    forAll (addressing_, i)
+    forAll(addressing_, i)
     {
         addressing_[i].setSize(1);
         weights_[i].setSize(1);
@@ -160,7 +160,7 @@ faFieldDecomposer::faFieldDecomposer
         static_cast<processorEdgePatchFieldDecomposer*>(NULL)
     )
 {
-    forAll (boundaryAddressing_, patchi)
+    forAll(boundaryAddressing_, patchi)
     {
         if (boundaryAddressing_[patchi] >= 0)
         {
@@ -205,7 +205,7 @@ faFieldDecomposer::faFieldDecomposer
 
 faFieldDecomposer::~faFieldDecomposer()
 {
-    forAll (patchFieldDecomposerPtrs_, patchi)
+    forAll(patchFieldDecomposerPtrs_, patchi)
     {
         if (patchFieldDecomposerPtrs_[patchi])
         {
@@ -213,7 +213,7 @@ faFieldDecomposer::~faFieldDecomposer()
         }
     }
 
-    forAll (processorAreaPatchFieldDecomposerPtrs_, patchi)
+    forAll(processorAreaPatchFieldDecomposerPtrs_, patchi)
     {
         if (processorAreaPatchFieldDecomposerPtrs_[patchi])
         {
@@ -221,7 +221,7 @@ faFieldDecomposer::~faFieldDecomposer()
         }
     }
 
-    forAll (processorEdgePatchFieldDecomposerPtrs_, patchi)
+    forAll(processorEdgePatchFieldDecomposerPtrs_, patchi)
     {
         if (processorEdgePatchFieldDecomposerPtrs_[patchi])
         {
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
index c426be343e..b9a33275d9 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
@@ -283,7 +283,7 @@ public:
 
         //- Decompose area field
         template<class Type>
-        tmp<GeometricField<Type, faPatchField, areaMesh> >
+        tmp<GeometricField<Type, faPatchField, areaMesh>>
         decomposeField
         (
             const GeometricField<Type, faPatchField, areaMesh>& field
@@ -291,7 +291,7 @@ public:
 
         //- Decompose surface field
         template<class Type>
-        tmp<GeometricField<Type, faePatchField, edgeMesh> >
+        tmp<GeometricField<Type, faePatchField, edgeMesh>>
         decomposeField
         (
             const GeometricField<Type, faePatchField, edgeMesh>& field
diff --git a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C
index 13b6f7e173..66b7f826a6 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C
@@ -37,7 +37,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, faPatchField, areaMesh> >
+tmp<GeometricField<Type, faPatchField, areaMesh>>
 faFieldDecomposer::decomposeField
 (
     const GeometricField<Type, faPatchField, areaMesh>& field
@@ -47,9 +47,9 @@ faFieldDecomposer::decomposeField
     Field<Type> internalField(field.internalField(), faceAddressing_);
 
     // Create and map the patch field values
-    PtrList<faPatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<faPatchField<Type>> patchFields(boundaryAddressing_.size());
 
-    forAll (boundaryAddressing_, patchi)
+    forAll(boundaryAddressing_, patchi)
     {
         if (boundaryAddressing_[patchi] >= 0)
         {
@@ -85,7 +85,7 @@ faFieldDecomposer::decomposeField
     }
 
     // Create the field for the processor
-    return tmp<GeometricField<Type, faPatchField, areaMesh> >
+    return tmp<GeometricField<Type, faPatchField, areaMesh>>
     (
         new GeometricField<Type, faPatchField, areaMesh>
         (
@@ -107,7 +107,7 @@ faFieldDecomposer::decomposeField
 
 
 template<class Type>
-tmp<GeometricField<Type, faePatchField, edgeMesh> >
+tmp<GeometricField<Type, faePatchField, edgeMesh>>
 faFieldDecomposer::decomposeField
 (
     const GeometricField<Type, faePatchField, edgeMesh>& field
@@ -121,7 +121,7 @@ faFieldDecomposer::decomposeField
             procMesh_.nInternalEdges()
         )
     );
-    forAll (mapAddr, i)
+    forAll(mapAddr, i)
     {
         mapAddr[i] -= 1;
     }
@@ -140,27 +140,27 @@ faFieldDecomposer::decomposeField
     // (i.e. using slices)
     Field<Type> allEdgeField(field.mesh().nEdges());
 
-    forAll (field.internalField(), i)
+    forAll(field.internalField(), i)
     {
         allEdgeField[i] = field.internalField()[i];
     }
 
-    forAll (field.boundaryField(), patchi)
+    forAll(field.boundaryField(), patchi)
     {
         const Field<Type> & p = field.boundaryField()[patchi];
 
         const label patchStart = field.mesh().boundary()[patchi].start();
 
-        forAll (p, i)
+        forAll(p, i)
         {
             allEdgeField[patchStart + i] = p[i];
         }
     }
 
     // Create and map the patch field values
-    PtrList<faePatchField<Type> > patchFields(boundaryAddressing_.size());
+    PtrList<faePatchField<Type>> patchFields(boundaryAddressing_.size());
 
-    forAll (boundaryAddressing_, patchi)
+    forAll(boundaryAddressing_, patchi)
     {
         if (boundaryAddressing_[patchi] >= 0)
         {
@@ -196,7 +196,7 @@ faFieldDecomposer::decomposeField
     }
 
     // Create the field for the processor
-    return tmp<GeometricField<Type, faePatchField, edgeMesh> >
+    return tmp<GeometricField<Type, faePatchField, edgeMesh>>
     (
         new GeometricField<Type, faePatchField, edgeMesh>
         (
@@ -223,7 +223,7 @@ void faFieldDecomposer::decomposeFields
     const PtrList<GeoField>& fields
 ) const
 {
-    forAll (fields, fieldI)
+    forAll(fields, fieldI)
     {
         decomposeField(fields[fieldI])().write();
     }
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
index e64ddc140f..752c61bf49 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
@@ -112,7 +112,7 @@ void Foam::faMeshDecomposition::distributeFaces()
                 faceProcAddressingHash.insert(faceProcAddressing[i]);
             }
 
-            forAll (faceLabels(), faceI)
+            forAll(faceLabels(), faceI)
             {
                 if (faceProcAddressingHash.found(faceLabels()[faceI] + 1))
                 {
@@ -138,7 +138,7 @@ void Foam::faMeshDecomposition::distributeFaces()
                 )
             );
 
-            forAll (faceLabels(), faceI)
+            forAll(faceLabels(), faceI)
             {
                 if (faceProcAddressingHash.found(faceLabels()[faceI] + 1))
                 {
@@ -217,9 +217,9 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
     // Memory management
     {
-        List<SLList<label> > procFaceList(nProcs());
+        List<SLList<label>> procFaceList(nProcs());
 
-        forAll (faceToProc_, faceI)
+        forAll(faceToProc_, faceI)
         {
             if (faceToProc_[faceI] >= nProcs())
             {
@@ -235,7 +235,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
         }
 
         // Convert linked lists into normal lists
-        forAll (procFaceList, procI)
+        forAll(procFaceList, procI)
         {
             procFaceAddressing_[procI] = procFaceList[procI];
         }
@@ -337,7 +337,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
             edgesHash.insert(patch.edges()[curEdge], ++edgeI);
         }
 
-        forAll (boundary(), patchI)
+        forAll(boundary(), patchI)
         {
             // Include emptyFaPatch
 
@@ -402,7 +402,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
     // Memory management
     {
-        List<SLList<label> > procEdgeList(nProcs());
+        List<SLList<label>> procEdgeList(nProcs());
 
         forAll(procEdgeList, procI)
         {
@@ -416,14 +416,14 @@ void Foam::faMeshDecomposition::decomposeMesh()
         // Detect inter-processor boundaries
 
         // Neighbour processor for each subdomain
-        List<SLList<label> > interProcBoundaries(nProcs());
+        List<SLList<label>> interProcBoundaries(nProcs());
 
         // Edge labels belonging to each inter-processor boundary
-        List<SLList<SLList<label> > > interProcBEdges(nProcs());
+        List<SLList<SLList<label>>> interProcBEdges(nProcs());
 
-        List<SLList<label> > procPatchIndex(nProcs());
+        List<SLList<label>> procPatchIndex(nProcs());
 
-        forAll (neighbour, edgeI)
+        forAll(neighbour, edgeI)
         {
             if (faceToProc_[owner[edgeI]] != faceToProc_[neighbour[edgeI]])
             {
@@ -437,7 +437,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                 SLList<label>::iterator curInterProcBdrsOwnIter =
                     interProcBoundaries[ownerProc].begin();
 
-                SLList<SLList<label> >::iterator curInterProcBEdgesOwnIter =
+                SLList<SLList<label>>::iterator curInterProcBEdgesOwnIter =
                     interProcBEdges[ownerProc].begin();
 
                 bool interProcBouFound = false;
@@ -464,7 +464,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                         SLList<label>::iterator curInterProcBdrsNeiIter =
                             interProcBoundaries[neighbourProc].begin();
 
-                        SLList<SLList<label> >::iterator
+                        SLList<SLList<label>>::iterator
                             curInterProcBEdgesNeiIter =
                             interProcBEdges[neighbourProc].begin();
 
@@ -536,16 +536,16 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
         // for all processors, set the size of start index and patch size
         // lists to the number of patches in the mesh
-        forAll (procPatchSize_, procI)
+        forAll(procPatchSize_, procI)
         {
             procPatchSize_[procI].setSize(patches.size());
             procPatchStartIndex_[procI].setSize(patches.size());
         }
 
-        forAll (patches, patchI)
+        forAll(patches, patchI)
         {
             // Reset size and start index for all processors
-            forAll (procPatchSize_, procI)
+            forAll(procPatchSize_, procI)
             {
                 procPatchSize_[procI][patchI] = 0;
                 procPatchStartIndex_[procI][patchI] =
@@ -571,7 +571,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                     patchEdgeFaces[eI] = eF[patches[patchI][eI]][0];
                 }
 
-                forAll (patchEdgeFaces, edgeI)
+                forAll(patchEdgeFaces, edgeI)
                 {
                     const label curProc = faceToProc_[patchEdgeFaces[edgeI]];
 
@@ -604,7 +604,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                     cycOffset
                 );
 
-                forAll (firstEdgeFaces, edgeI)
+                forAll(firstEdgeFaces, edgeI)
                 {
                     if
                     (
@@ -627,7 +627,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                         SLList<label>::iterator curInterProcBdrsOwnIter =
                             interProcBoundaries[ownerProc].begin();
 
-                        SLList<SLList<label> >::iterator
+                        SLList<SLList<label>>::iterator
                             curInterProcBEdgesOwnIter =
                             interProcBEdges[ownerProc].begin();
 
@@ -658,7 +658,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                                 SLList<label>::iterator curInterProcBdrsNeiIter
                                    = interProcBoundaries[neighbourProc].begin();
 
-                                SLList<SLList<label> >::iterator
+                                SLList<SLList<label>>::iterator
                                     curInterProcBEdgesNeiIter =
                                     interProcBEdges[neighbourProc].begin();
 
@@ -758,7 +758,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
                 // Ordering in cyclic boundaries is important.
                 // Add the other half of cyclic edges for cyclic boundaries
                 // that remain on the processor
-                forAll (secondEdgeFaces, edgeI)
+                forAll(secondEdgeFaces, edgeI)
                 {
                     if
                     (
@@ -782,7 +782,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
         // Convert linked lists into normal lists
         // Add inter-processor boundaries and remember start indices
-        forAll (procEdgeList, procI)
+        forAll(procEdgeList, procI)
         {
             // Get internal and regular boundary processor faces
             SLList<label>& curProcEdges = procEdgeList[procI];
@@ -804,7 +804,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
             for
             (
-                SLList<SLList<label> >::iterator curInterProcBEdgesIter =
+                SLList<SLList<label>>::iterator curInterProcBEdgesIter =
                     interProcBEdges[procI].begin();
                 curInterProcBEdgesIter != interProcBEdges[procI].end();
                 ++curInterProcBEdgesIter
@@ -861,7 +861,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
             SLList<label>::iterator curInterProcBdrsIter =
                 interProcBoundaries[procI].begin();
 
-            SLList<SLList<label> >::iterator curInterProcBEdgesIter =
+            SLList<SLList<label>>::iterator curInterProcBEdgesIter =
                 interProcBEdges[procI].begin();
 
             for
@@ -926,7 +926,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
     // are omitted. For processor patches, set index to -1.
     // At the same time, filter the procPatchSize_ and procPatchStartIndex_
     // lists to exclude zero-size patches
-    forAll (procPatchSize_, procI)
+    forAll(procPatchSize_, procI)
     {
         // Make a local copy of old lists
         const labelList oldPatchSizes = procPatchSize_[procI];
@@ -950,7 +950,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
         label nPatches = 0;
 
-        forAll (oldPatchSizes, patchI)
+        forAll(oldPatchSizes, patchI)
         {
             if (oldPatchSizes[patchI] > 0)
             {
@@ -968,7 +968,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
         curPatchSizes.setSize(nPatches);
         curPatchStarts.setSize(nPatches);
 
-        forAll (curProcessorPatchSizes, procPatchI)
+        forAll(curProcessorPatchSizes, procPatchI)
         {
             curBoundaryAddressing[nPatches] = -1;
 
@@ -1013,7 +1013,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
             // Reset the lookup list
             pointsUsage = 0;
 
-            forAll (curProcessorPatchStarts, patchI)
+            forAll(curProcessorPatchStarts, patchI)
             {
                 const label curStart = curProcessorPatchStarts[patchI];
                 const label curEnd = curStart + curProcessorPatchSizes[patchI];
@@ -1031,7 +1031,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
 
                     const edge& e = edges[curE];
 
-                    forAll (e, pointI)
+                    forAll(e, pointI)
                     {
                         if (pointsUsage[e[pointI]] == 0)
                         {
@@ -1164,7 +1164,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
     // Make a lookup map for globally shared points
     Map<label> sharedPointLookup(2*globallySharedPoints_.size());
 
-    forAll (globallySharedPoints_, pointi)
+    forAll(globallySharedPoints_, pointi)
     {
         sharedPointLookup.insert(globallySharedPoints_[pointi], pointi);
     }
@@ -1249,7 +1249,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
 
         label nPatches = 0;
 
-        forAll (curPatchSizes, patchi)
+        forAll(curPatchSizes, patchi)
         {
             const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
 
@@ -1272,7 +1272,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
             nPatches++;
         }
 
-        forAll (curProcessorPatchSizes, procPatchI)
+        forAll(curProcessorPatchSizes, procPatchI)
         {
             const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
 
@@ -1310,7 +1310,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
         label nProcPatches = 0;
         label nProcEdges = 0;
 
-        forAll (procMesh.boundary(), patchi)
+        forAll(procMesh.boundary(), patchi)
         {
             if
             (
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H
index 2d2258abb6..930a4fd036 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H
+++ b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H
@@ -80,13 +80,13 @@ class faMeshDecomposition
         labelListList procFaceLabels_;
 
         //-
-        List<Map<label> > procMeshEdgesMap_;
+        List<Map<label>> procMeshEdgesMap_;
 
         //- Number of internal edges for each processor mesh
         labelList procNInternalEdges_;
 
         //- Edge labels for patches of processor meshes
-        List<List<List<label> > > procPatchEdgeLabels_;
+        List<List<List<label>>> procPatchEdgeLabels_;
 
         //- Labels of points for each processor
         labelListList procPatchPointAddressing_;
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
index d7a4c42e78..6b97b8a4ac 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
+++ b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
@@ -158,7 +158,7 @@ public:
 
         //- Reconstruct area field
         template<class Type>
-        tmp<GeometricField<Type, faPatchField, areaMesh> >
+        tmp<GeometricField<Type, faPatchField, areaMesh>>
         reconstructFaAreaField
         (
             const IOobject& fieldIoObject
@@ -166,7 +166,7 @@ public:
 
         //- Reconstruct edge field
         template<class Type>
-        tmp<GeometricField<Type, faePatchField, edgeMesh> >
+        tmp<GeometricField<Type, faePatchField, edgeMesh>>
         reconstructFaEdgeField
         (
             const IOobject& fieldIoObject
diff --git a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
index fd967cb0ee..0b8f943e29 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
@@ -36,19 +36,19 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
 Foam::faFieldReconstructor::reconstructFaAreaField
 (
     const IOobject& fieldIoObject
 )
 {
     // Read the field for all the processors
-    PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields
+    PtrList<GeometricField<Type, faPatchField, areaMesh>> procFields
     (
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -72,7 +72,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
     Field<Type> internalField(mesh_.nFaces());
 
     // Create the patch fields
-    PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size());
+    PtrList<faPatchField<Type>> patchFields(mesh_.boundary().size());
 
 
     // Create global mesh patches starts
@@ -89,7 +89,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
         gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
     }
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, faPatchField, areaMesh>& procField =
             procFields[procI];
@@ -203,7 +203,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
 //                         label curBPatch = mesh_.boundary().whichPatch(curE);
                         label curBPatch = -1;
 
-                        forAll (mesh_.boundary(), pI)
+                        forAll(mesh_.boundary(), pI)
                         {
                             if
                             (
@@ -273,7 +273,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
 
     // Now construct and write the field
     // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faPatchField, areaMesh> >
+    return tmp<GeometricField<Type, faPatchField, areaMesh>>
     (
         new GeometricField<Type, faPatchField, areaMesh>
         (
@@ -295,19 +295,19 @@ Foam::faFieldReconstructor::reconstructFaAreaField
 
 
 template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> >
+Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh>>
 Foam::faFieldReconstructor::reconstructFaEdgeField
 (
     const IOobject& fieldIoObject
 )
 {
     // Read the field for all the processors
-    PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields
+    PtrList<GeometricField<Type, faePatchField, edgeMesh>> procFields
     (
         procMeshes_.size()
     );
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         procFields.set
         (
@@ -332,7 +332,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
     Field<Type> internalField(mesh_.nInternalEdges());
 
     // Create the patch fields
-    PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size());
+    PtrList<faePatchField<Type>> patchFields(mesh_.boundary().size());
 
 
     labelList gStarts(mesh_.boundary().size(), -1);
@@ -348,7 +348,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
     }
 
 
-    forAll (procMeshes_, procI)
+    forAll(procMeshes_, procI)
     {
         const GeometricField<Type, faePatchField, edgeMesh>& procField =
             procFields[procI];
@@ -361,7 +361,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
         {
             labelList curAddr(edgeProcAddressing_[procI]);
 
-//             forAll (curAddr, addrI)
+//             forAll(curAddr, addrI)
 //             {
 //                 curAddr[addrI] -= 1;
 //             }
@@ -476,7 +476,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
 
                             label curBPatch = -1;
 
-                            forAll (mesh_.boundary(), pI)
+                            forAll(mesh_.boundary(), pI)
                             {
                                 if
                                 (
@@ -553,7 +553,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
 
     // Now construct and write the field
     // setting the internalField and patchFields
-    return tmp<GeometricField<Type, faePatchField, edgeMesh> >
+    return tmp<GeometricField<Type, faePatchField, edgeMesh>>
     (
         new GeometricField<Type, faePatchField, edgeMesh>
         (
diff --git a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C b/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C
index 29004ff630..99b9aaf575 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C
@@ -32,7 +32,7 @@ License
 
 void Foam::processorFaMeshes::read()
 {
-    forAll (fvMeshes_, procI)
+    forAll(fvMeshes_, procI)
     {
         meshes_.set
         (
@@ -151,7 +151,7 @@ Foam::processorFaMeshes::processorFaMeshes
 // {
 //     fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
 
-//     forAll (databases_, procI)
+//     forAll(databases_, procI)
 //     {
 //         // Check if any new meshes need to be read.
 //         fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@@ -206,7 +206,7 @@ Foam::processorFaMeshes::processorFaMeshes
 //     // Read the field for all the processors
 //     PtrList<pointIOField> procsPoints(meshes_.size());
 
-//     forAll (meshes_, procI)
+//     forAll(meshes_, procI)
 //     {
 //         procsPoints.set
 //         (
@@ -229,7 +229,7 @@ Foam::processorFaMeshes::processorFaMeshes
 //     // Create the new points
 //     vectorField newPoints(mesh.nPoints());
 
-//     forAll (meshes_, procI)
+//     forAll(meshes_, procI)
 //     {
 //         const vectorField& procPoints = procsPoints[procI];
 
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
index 07e0c169fd..a7425ea7f6 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
@@ -23,7 +23,7 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-    
+
 \*---------------------------------------------------------------------------*/
 
 #include "EulerFaD2dt2Scheme.H"
@@ -60,7 +60,7 @@ template<class Type>
 tmp<GeometricField<Type, faPatchField, areaMesh>>
 EulerFaD2dt2Scheme<Type>::facD2dt2
 (
-    const dimensioned<Type> dt 
+    const dimensioned<Type> dt
 )
 {
 
@@ -89,7 +89,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
         scalarField SS0 = mesh().S() + mesh().S0();
         scalarField S0S00 = mesh().S0() + mesh().S00();
 
-        tmp<GeometricField<Type, faPatchField, areaMesh> > tdt2dt2
+        tmp<GeometricField<Type, faPatchField, areaMesh>> tdt2dt2
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -113,7 +113,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     }
     else
     {
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -165,7 +165,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
         scalarField SS0 = mesh().S() + mesh().S0();
         scalarField S0S00 = mesh().S0() + mesh().S00();
 
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -192,7 +192,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     }
     else
     {
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -234,7 +234,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
-    scalar coefft0  = coefft + coefft00;  
+    scalar coefft0  = coefft + coefft00;
 
     if (mesh().moving())
     {
@@ -248,7 +248,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
             (mesh().S0() + mesh().S00())
            *rho.value();
 
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -277,12 +277,12 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
     else
     {
 
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
                 d2dt2IOobject,
-                rDeltaT2 * rho.value() * 
+                rDeltaT2 * rho.value() *
                 (
                     coefft*vf
                   - coefft0*vf.oldTime()
@@ -340,7 +340,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
             )
         );
 
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -362,7 +362,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
                     coefft
                    *(rho.boundaryField() + rho.oldTime().boundaryField())
                    *vf.boundaryField()
-                        
+
                   - (
                         coefft
                        *(
@@ -392,7 +392,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
         areaScalarField rhoRho0(rho + rho.oldTime());
         areaScalarField rho0Rho00(rho.oldTime() + rho.oldTime().oldTime());
 
-        return tmp<GeometricField<Type, faPatchField, areaMesh> >
+        return tmp<GeometricField<Type, faPatchField, areaMesh>>
         (
             new GeometricField<Type, faPatchField, areaMesh>
             (
@@ -416,7 +416,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
     const GeometricField<Type, faPatchField, areaMesh>& vf
 )
 {
-    tmp<faMatrix<Type> > tfam
+    tmp<faMatrix<Type>> tfam
     (
         new faMatrix<Type>
         (
@@ -428,7 +428,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
     faMatrix<Type>& fam = tfam.ref();
 
     scalar deltaT = deltaT_();
-    scalar deltaT0 = deltaT0_(); 
+    scalar deltaT0 = deltaT0_();
 
     scalar coefft = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -469,14 +469,14 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
 
 
 template<class Type>
-tmp<faMatrix<Type> >
+tmp<faMatrix<Type>>
 EulerFaD2dt2Scheme<Type>::famD2dt2
 (
     const dimensionedScalar& rho,
     const GeometricField<Type, faPatchField, areaMesh>& vf
 )
 {
-    tmp<faMatrix<Type> > tfam
+    tmp<faMatrix<Type>> tfam
     (
         new faMatrix<Type>
         (
@@ -489,7 +489,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
     faMatrix<Type>& fam = tfam.ref();
 
     scalar deltaT = deltaT_();
-    scalar deltaT0 = deltaT0_(); 
+    scalar deltaT0 = deltaT0_();
 
     scalar coefft = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -537,7 +537,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
     const GeometricField<Type, faPatchField, areaMesh>& vf
 )
 {
-    tmp<faMatrix<Type> > tfam
+    tmp<faMatrix<Type>> tfam
     (
         new faMatrix<Type>
         (
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
index 8d57b6649e..6122ca42c5 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
@@ -104,40 +104,40 @@ public:
             return fa::faD2dt2Scheme<Type>::mesh();
         }
 
-        tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const dimensioned<Type>
         );
 
-        tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const GeometricField<Type, faPatchField, areaMesh>&
         );
 
-        tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, faPatchField, areaMesh>&
         );
 
-        tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const areaScalarField&,
             const GeometricField<Type, faPatchField, areaMesh>&
         );
 
-        tmp<faMatrix<Type> > famD2dt2
+        tmp<faMatrix<Type>> famD2dt2
         (
             const GeometricField<Type, faPatchField, areaMesh>&
         );
 
-        tmp<faMatrix<Type> > famD2dt2
+        tmp<faMatrix<Type>> famD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, faPatchField, areaMesh>&
         );
 
-        tmp<faMatrix<Type> > famD2dt2
+        tmp<faMatrix<Type>> famD2dt2
         (
             const areaScalarField&,
             const GeometricField<Type, faPatchField, areaMesh>&
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C
index b425bfd0b0..c41a109465 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C
@@ -45,7 +45,7 @@ namespace fa
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<faD2dt2Scheme<Type> > faD2dt2Scheme<Type>::New
+tmp<faD2dt2Scheme<Type>> faD2dt2Scheme<Type>::New
 (
     const faMesh& mesh,
     Istream& schemeData
diff --git a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
index e9a09f2717..c61bcaaec3 100644
--- a/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
@@ -122,7 +122,7 @@ public:
     // Selectors
 
         //- Return a pointer to a new d2dt2Scheme created on freestore
-        static tmp<faD2dt2Scheme<Type> > New
+        static tmp<faD2dt2Scheme<Type>> New
         (
             const faMesh& mesh,
             Istream& schemeData
@@ -141,40 +141,40 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const dimensioned<Type>
         ) = 0;
 
-        virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const GeometricField<Type, faPatchField, areaMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, faPatchField, areaMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2
+        virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
         (
             const areaScalarField&,
             const GeometricField<Type, faPatchField, areaMesh>&
         ) = 0;
 
-        virtual tmp<faMatrix<Type> > famD2dt2
+        virtual tmp<faMatrix<Type>> famD2dt2
         (
             const GeometricField<Type, faPatchField, areaMesh>&
         ) = 0;
 
-        virtual tmp<faMatrix<Type> > famD2dt2
+        virtual tmp<faMatrix<Type>> famD2dt2
         (
             const dimensionedScalar&,
             const GeometricField<Type, faPatchField, areaMesh>&
         ) = 0;
 
-        virtual tmp<faMatrix<Type> > famD2dt2
+        virtual tmp<faMatrix<Type>> famD2dt2
         (
             const areaScalarField&,
             const GeometricField<Type, faPatchField, areaMesh>&
@@ -194,17 +194,17 @@ public:
 
 // Add the patch constructor functions to the hash tables
 
-#define makeFaD2dt2TypeScheme(SS, Type)                                         \
-                                                                                \
-    defineNamedTemplateTypeNameAndDebug(Foam::fa::SS<Foam::Type>, 0);           \
-                                                                                \
-    namespace Foam                                                              \
-    {                                                                           \
-        namespace fa                                                            \
-        {                                                                       \
-            faD2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> >        \
-                add##SS##Type##IstreamConstructorToTable_;                      \
-        }                                                                       \
+#define makeFaD2dt2TypeScheme(SS, Type)                                        \
+                                                                               \
+    defineNamedTemplateTypeNameAndDebug(Foam::fa::SS<Foam::Type>, 0);          \
+                                                                               \
+    namespace Foam                                                             \
+    {                                                                          \
+        namespace fa                                                           \
+        {                                                                      \
+            faD2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type>>        \
+                add##SS##Type##IstreamConstructorToTable_;                     \
+        }                                                                      \
     }
 
 
diff --git a/src/finiteArea/finiteArea/fac/facD2dt2.H b/src/finiteArea/finiteArea/fac/facD2dt2.H
index e084e4adb8..d2fc02a7d5 100644
--- a/src/finiteArea/finiteArea/fac/facD2dt2.H
+++ b/src/finiteArea/finiteArea/fac/facD2dt2.H
@@ -56,27 +56,27 @@ namespace Foam
 namespace fac
 {
     template<class Type>
-    tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2
+    tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
     (
         const dimensioned<Type>,
         const faMesh&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2
+    tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
     (
         const GeometricField<Type, faPatchField, areaMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2
+    tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
     (
         const dimensionedScalar&,
         const GeometricField<Type, faPatchField, areaMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2
+    tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
     (
         const areaScalarField&,
         const GeometricField<Type, faPatchField, areaMesh>&
diff --git a/src/finiteArea/finiteArea/fam/famD2dt2.H b/src/finiteArea/finiteArea/fam/famD2dt2.H
index 08c6d6beac..5e0e4a2b8e 100644
--- a/src/finiteArea/finiteArea/fam/famD2dt2.H
+++ b/src/finiteArea/finiteArea/fam/famD2dt2.H
@@ -53,20 +53,20 @@ namespace Foam
 namespace fam
 {
     template<class Type>
-    tmp<faMatrix<Type> > d2dt2
+    tmp<faMatrix<Type>> d2dt2
     (
         const GeometricField<Type, faPatchField, areaMesh>&
     );
 
     template<class Type>
-    tmp<faMatrix<Type> > d2dt2
+    tmp<faMatrix<Type>> d2dt2
     (
         const dimensionedScalar&,
         const GeometricField<Type, faPatchField, areaMesh>&
     );
 
     template<class Type>
-    tmp<faMatrix<Type> > d2dt2
+    tmp<faMatrix<Type>> d2dt2
     (
         const areaScalarField&,
         const GeometricField<Type, faPatchField, areaMesh>&
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
index 1462d08602..deb3b89bd1 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@@ -184,7 +184,7 @@ void Foam::isoAdvection::timeIntegratedFlux()
     }
 
     // Storage for isoFace points. Only used if writeIsoFacesToFile_
-    DynamicList<List<point> > isoFacePts;
+    DynamicList<List<point>> isoFacePts;
 
     // Loop through all cells
     forAll(alpha1In_, celli)
diff --git a/src/overset/oversetPolyPatch/semiImplicitOversetFvPatchField.H b/src/overset/oversetPolyPatch/semiImplicitOversetFvPatchField.H
index f01a412ec1..590e706750 100644
--- a/src/overset/oversetPolyPatch/semiImplicitOversetFvPatchField.H
+++ b/src/overset/oversetPolyPatch/semiImplicitOversetFvPatchField.H
@@ -111,9 +111,9 @@ public:
         );
 
         //- Construct and return a clone
-        virtual tmp<fvPatchField<Type> > clone() const
+        virtual tmp<fvPatchField<Type>> clone() const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new semiImplicitOversetFvPatchField<Type>(*this)
             );
@@ -127,12 +127,12 @@ public:
         );
 
         //- Construct and return a clone setting internal field reference
-        virtual tmp<fvPatchField<Type> > clone
+        virtual tmp<fvPatchField<Type>> clone
         (
             const DimensionedField<Type, volMesh>& iF
         ) const
         {
-            return tmp<fvPatchField<Type> >
+            return tmp<fvPatchField<Type>>
             (
                 new semiImplicitOversetFvPatchField<Type>(*this, iF)
             );
diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
index 961e62fb11..61d6283b14 100644
--- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C
+++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C
@@ -250,7 +250,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
             vectorField newDelta(cells.size() + 1, vector::zero);
 
             label j = 0;
-            forAllReverse (cells, i)
+            forAllReverse(cells, i)
             {
                 const label celli = cells[i];
                 newDelta[j+1] = (deltaV[celli]/mag(sf))*n + newDelta[j];
diff --git a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
index c7c816601b..ff2c442d80 100644
--- a/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
+++ b/src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
@@ -47,9 +47,9 @@ writeFileHeader
     const wordList& speciesNames =
         chemistryModel_.thermo().composition().species();
 
-    forAll (speciesNames, si)
+    for (const word& speciesName : speciesNames)
     {
-        writeTabbed(os, speciesNames[si]);
+        writeTabbed(os, speciesName);
     }
 
     os  << endl;
diff --git a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
index 30dbe855af..a38fd647e0 100644
--- a/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
+++ b/src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
@@ -126,7 +126,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRsHs() const
 
         for (label i=0; i < nSolids_; i++)
         {
-            forAll (RRs, cellI)
+            forAll(RRs, cellI)
             {
                 RRs[cellI] +=
                     RRs_[i][cellI]*solidThermo_[i].Hs(p[cellI], T[cellI]);