From 95dcb6ded7de30faaa3cb43b3d1fd0c77ce88259 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sat, 10 Jan 2009 20:28:06 +0100
Subject: [PATCH] Simplify checking of container (List/HashTable, strings)
 sizes

- can use 'XX.empty()' instead of 'XX.size() == 0', 'XX.size() < 1' or
  'XX.size() <= 0' or for simpler coding.
  It also has the same number of characters as '!XX.size()' and /might/ be
  more readable

- many size checking had 'XX.size() > 0', 'XX.size() != 0', or 'XX.size() >= 1'
  when a simple 'XX.size()' suffices
---
 .../combustion/PDRFoam/PDRFoamAutoRefine.C    |  7 +--
 .../advanced/autoRefineMesh/autoRefineMesh.C  |  6 +--
 .../mesh/advanced/modifyMesh/modifyMesh.C     | 17 ++++---
 .../refinementLevel/refinementLevel.C         |  2 +-
 .../mesh/advanced/splitCells/splitCells.C     |  2 +-
 .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C   |  2 +-
 .../fluentMeshToFoam/fluentMeshToFoam.L       |  6 +--
 .../mesh/conversion/gmshToFoam/gmshToFoam.C   | 12 ++---
 .../ideasUnvToFoam/ideasUnvToFoam.C           |  2 +-
 .../netgenNeutralToFoam/netgenNeutralToFoam.C |  2 +-
 .../polyDualMesh/makePolyDualMesh.C           |  4 +-
 .../conversion/polyDualMesh/meshDualiser.C    | 15 +++---
 .../mesh/conversion/sammToFoam/readCouples.C  |  4 +-
 .../starToFoam/createCoupleMatches.C          | 31 ++++++------
 .../mesh/conversion/starToFoam/starMesh.C     |  2 +-
 .../conversion/tetgenToFoam/tetgenToFoam.C    | 12 ++---
 .../mesh/generation/blockMesh/blockMesh.C     |  2 +-
 .../mesh/generation/blockMesh/blockMeshApp.C  |  2 +-
 .../generation/blockMesh/mergePatchPairs.C    |  2 +-
 .../manipulation/checkMesh/checkTopology.C    |  4 +-
 .../manipulation/createPatch/createPatch.C    |  4 +-
 .../manipulation/mergeMeshes/mergePolyMesh.C  | 19 ++++----
 .../mesh/manipulation/objToVTK/objToVTK.C     |  2 +-
 .../mesh/manipulation/refineMesh/refineMesh.C |  2 +-
 .../mesh/manipulation/setSet/setSet.C         | 24 +++++-----
 .../mesh/manipulation/splitMesh/splitMesh.C   |  4 +-
 .../splitMeshRegions/splitMeshRegions.C       |  6 +--
 .../mesh/manipulation/stitchMesh/stitchMesh.C |  2 +-
 .../transformPoints/transformPoints.C         |  2 +-
 .../decomposePar/distributeCells.C            |  4 +-
 .../reconstructPar/reconstructPar.C           |  4 +-
 .../foamToEnsight/ensightField.C              |  8 ++--
 .../foamToEnsight/ensightMesh.C               | 16 +++----
 .../foamToEnsight/ensightWriteBinary.C        |  2 +-
 .../foamToEnsightParts/validateFields.H       |  4 +-
 .../foamToFieldview9/foamToFieldview9.C       |  2 +-
 .../dataConversion/foamToGMV/gmvOutput.H      |  2 +-
 .../foamToGMV/gmvOutputLagrangian.H           | 33 +++----------
 .../dataConversion/foamToGMV/gmvOutputSpray.H |  9 +---
 .../dataConversion/foamToVTK/foamToVTK.C      |  2 +-
 .../dataConversion/foamToVTK/readFields.C     |  2 +-
 .../dataConversion/foamToVTK/vtkMesh.C        |  4 +-
 .../dataConversion/foamToVTK/vtkMesh.H        |  4 +-
 .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H     |  5 ++
 .../ensightFoamReader/USERD_set_filenames.H   |  4 +-
 .../ensightFoamReader/getLagrangianScalar.H   | 13 ++---
 .../ensightFoamReader/getLagrangianVector.H   | 10 +---
 .../fieldview9Reader/fieldview9Reader.C       |  7 ++-
 .../fieldview9Reader/readerDatabase.C         |  8 ++--
 .../preProcessing/mapFields/mapLagrangian.C   |  4 +-
 .../surface/surfaceCheck/surfaceCheck.C       |  6 +--
 .../surface/surfaceClean/collapseBase.C       |  2 +-
 .../surfaceFeatureConvert.C                   | 16 +++----
 .../surfaceSplitByPatch/surfaceSplitByPatch.C |  2 +-
 .../surface/surfaceSubset/surfaceSubset.C     |  8 ++--
 .../surfaceTransformPoints.C                  |  2 +-
 src/OSspecific/Unix/Unix.C                    | 28 +++++------
 src/OSspecific/Unix/printStack.C              |  4 +-
 .../StaticHashTable/StaticHashTable.C         |  4 +-
 .../StaticHashTable/StaticHashTableI.H        |  4 +-
 src/OpenFOAM/db/IOobjectList/IOobjectList.C   |  6 +--
 src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C |  2 +-
 src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C |  2 +-
 src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C | 12 ++---
 src/OpenFOAM/db/Time/timeSelector.C           |  2 +-
 src/OpenFOAM/db/dictionary/dictionary.C       | 10 ++--
 .../primitiveEntry/primitiveEntry.C           | 14 ++++--
 .../primitiveEntry/primitiveEntry.H           |  6 +--
 .../db/regIOobject/regIOobjectWrite.C         |  2 +-
 .../Fields/symmTensorField/symmTensorField.C  |  2 +-
 .../fields/Fields/tensorField/tensorField.C   |  2 +-
 .../CalcPatchToPatchWeights.C                 |  2 +-
 .../meshes/bandCompression/bandCompression.C  |  2 +-
 src/OpenFOAM/meshes/boundBox/boundBox.C       |  2 +-
 src/OpenFOAM/meshes/meshTools/matchPoints.C   |  2 +-
 src/OpenFOAM/meshes/meshTools/mergePoints.C   |  4 +-
 .../pointMesh/pointMeshMapper/pointMapper.C   | 10 ++--
 .../mapPolyMesh/cellMapper/cellMapper.C       | 26 +++++-----
 .../mapPolyMesh/faceMapper/faceMapper.C       | 18 +++----
 .../mapPolyMesh/mapDistribute/mapDistribute.C |  8 ++--
 .../mapDistribute/mapDistributeTemplates.C    | 24 +++++-----
 .../polyBoundaryMesh/polyBoundaryMesh.C       |  4 +-
 src/OpenFOAM/meshes/polyMesh/polyMesh.C       |  9 +---
 .../basic/coupled/coupledPolyPatch.H          |  4 +-
 .../constraint/cyclic/cyclicPolyPatch.C       |  4 +-
 .../PrimitivePatch/PrimitivePatchAddressing.C |  2 +-
 .../PrimitivePatchLocalPointOrder.C           |  2 +-
 .../PrimitivePatchExtraCleanup.C              |  2 +-
 .../PrimitivePatchExtraSearch.C               |  4 +-
 .../primitiveMeshCheck/primitiveMeshCheck.C   |  4 +-
 .../primitiveMesh/primitivePatch/patchZones.C |  4 +-
 .../primitiveMesh/primitivePatch/walkPatch.C  | 47 +++++++------------
 src/OpenFOAM/primitives/bools/bool/bool.H     |  3 +-
 src/OpenFOAM/primitives/bools/bool/boolIO.C   |  7 ++-
 src/OpenFOAM/primitives/nil/nil.H             |  5 +-
 .../primitives/strings/fileName/fileName.C    |  6 +--
 src/OpenFOAM/primitives/strings/word/wordI.H  | 10 ++--
 src/OpenFOAM/primitives/strings/word/wordIO.C |  2 +-
 src/Pstream/gamma/OPwrite.C                   |  2 +-
 src/Pstream/mpi/IPread.C                      |  2 +-
 src/Pstream/mpi/OPwrite.C                     |  2 +-
 .../autoHexMeshDriver/autoHexMeshDriver.C     |  2 +-
 .../autoHexMeshDriver/autoLayerDriver.C       |  2 +-
 .../autoHexMeshDriver/autoRefineDriver.C      |  4 +-
 .../autoHexMeshDriver/autoSnapDriver.C        | 12 ++---
 .../meshRefinement/meshRefinement.C           |  6 +--
 .../meshRefinement/meshRefinementBaffles.C    |  8 ++--
 .../refinementSurfaces/refinementSurfaces.C   | 16 +++----
 .../autoHexMesh/shellSurfaces/shellSurfaces.C |  2 +-
 src/conversion/meshTables/boundaryRegion.C    |  6 +--
 src/conversion/meshTables/cellTable.C         |  6 +--
 .../meshWriter/starcd/STARCDMeshWriter.C      |  8 ++--
 src/conversion/polyDualMesh/polyDualMesh.C    |  8 ++--
 .../hierarchGeomDecomp/hierarchGeomDecomp.C   | 12 +++--
 .../metisDecomp/metisDecomp.C                 |  4 +-
 .../parMetisDecomp/parMetisDecomp.C           | 12 ++---
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 12 ++---
 src/dynamicMesh/attachDetach/attachDetach.C   | 12 ++---
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   | 32 ++++++-------
 .../fvMeshDistribute/fvMeshDistribute.C       | 12 ++---
 .../layerAdditionRemoval.C                    |  6 +--
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   | 35 +++++---------
 .../meshCut/cellLooper/hexCellLooper.C        | 23 +++++----
 .../meshCut/cellLooper/topoCellLooper.C       | 15 +++---
 .../meshCutAndRemove/meshCutAndRemove.C       | 38 +++++++--------
 .../meshModifiers/meshCutter/meshCutter.C     | 37 +++++++--------
 .../multiDirRefinement/multiDirRefinement.C   |  4 +-
 .../motionSmoother/motionSmoother.C           |  6 +--
 .../polyMeshAdder/faceCoupleInfo.C            | 32 +++++--------
 .../attachPolyTopoChanger.C                   | 17 ++++---
 .../polyTopoChange/addPatchCellLayer.C        | 35 +++++++-------
 .../polyTopoChange/addPatchCellLayer.H        |  4 +-
 .../polyTopoChange/combineFaces.C             |  2 +-
 .../polyTopoChange/edgeCollapser.C            |  2 +-
 .../polyTopoChange/faceCollapser.C            |  2 +-
 .../polyTopoChange/polyTopoChange/hexRef8.C   |  4 +-
 .../polyTopoChange/localPointRegion.C         |  8 ++--
 .../polyTopoChange/polyTopoChange.C           | 14 +++---
 .../polyTopoChange/polyTopoChangeI.H          |  2 +-
 .../polyTopoChange/refinementHistory.C        |  4 +-
 .../polyTopoChange/removePoints.H             |  2 +-
 .../slidingInterface/coupleSlidingInterface.C |  4 +-
 .../enrichedPatch/enrichedPatchCutFaces.C     |  2 +-
 .../enrichedPatch/enrichedPatchFaces.C        |  4 +-
 .../slidingInterface/slidingInterface.C       |  6 +--
 src/edgeMesh/edgeMesh.C                       |  2 +-
 .../derived/fan/fanFvPatchField.C             |  4 +-
 .../timeVaryingMappedFixedValueFvPatchField.C |  2 +-
 .../finiteVolume/fvSchemes/fvSchemes.C        | 22 +++------
 .../extendedStencil/faceStencil/faceStencil.C |  4 +-
 src/finiteVolume/fvMesh/fvMesh.C              |  7 +--
 .../skewCorrected/skewCorrectionVectors.C     |  2 +-
 .../displacementInterpolationFvMotionSolver.C |  2 +-
 .../inverseDistanceDiffusivity.C              |  2 +-
 ...aceSlipDisplacementPointPatchVectorField.C |  2 +-
 src/lagrangian/basic/Particle/Particle.C      |  2 +-
 src/lagrangian/dieselSpray/parcel/parcelIO.C  |  2 +-
 .../definedHollowCone/definedHollowCone.C     |  4 +-
 .../molecule/distribution/distribution.C      |  6 +--
 .../tetherPotentialList/tetherPotentialList.C |  4 +-
 src/meshTools/cellDist/cellDistFuncs.C        |  2 +-
 src/meshTools/cellFeatures/cellFeatures.C     |  2 +-
 .../directMappedPolyPatch.C                   |  6 +--
 src/meshTools/indexedOctree/indexedOctree.C   | 30 ++++++------
 src/meshTools/indexedOctree/indexedOctree.H   |  2 +-
 src/meshTools/octree/octree.C                 |  4 +-
 src/meshTools/octree/octreeLine.C             |  2 +-
 src/meshTools/octree/treeBoundBox.C           |  4 +-
 src/meshTools/octree/treeNode.C               |  8 +---
 .../polyMeshZipUpCells/polyMeshZipUpCells.C   |  2 +-
 src/meshTools/regionSplit/regionSplit.C       |  6 +--
 .../searchableSurface/searchableBox.C         |  2 +-
 .../searchableSurface/searchablePlate.C       |  2 +-
 .../searchableSurface/searchableSphere.C      |  2 +-
 .../searchableSurfacesQueries.C               |  2 +-
 .../searchableSurface/triSurfaceMesh.C        |  2 +-
 .../nearestToPoint/nearestToPoint.C           |  2 +-
 .../intersectedSurface/edgeSurface.C          |  2 +-
 .../intersectedSurface/intersectedSurface.C   |  4 +-
 .../surfaceIntersection/edgeIntersections.C   |  4 +-
 .../surfaceIntersection/surfaceIntersection.C |  2 +-
 .../surfaceIntersectionFuncs.C                |  2 +-
 .../orientedSurface/orientedSurface.C         |  4 +-
 .../twoDPointCorrector/twoDPointCorrector.C   |  6 +--
 src/sampling/cuttingPlane/cuttingPlane.H      |  2 +-
 .../calculateMeshToMeshAddressing.C           |  2 +-
 .../meshToMesh/calculateMeshToMeshWeights.C   |  2 +-
 src/sampling/probes/probes.C                  |  2 +-
 src/sampling/sampledSet/cloud/cloudSet.C      |  2 +-
 src/sampling/sampledSet/curve/curveSet.C      | 15 +++---
 src/sampling/sampledSet/face/faceOnlySet.C    | 13 +++--
 .../sampledSet/sampledSets/sampledSets.C      |  2 +-
 src/sampling/sampledSet/uniform/uniformSet.C  | 13 +++--
 .../sampledSurface/isoSurface/isoSurface.C    |  8 ++--
 .../isoSurface/isoSurfaceCell.C               | 26 ++++------
 .../sampledSurface/sampledSurfaceTemplates.C  |  2 +-
 .../BasicMeshedSurface/BasicMeshedSurface.C   |  2 +-
 src/surfMesh/MeshedSurface/MeshedSurface.C    |  8 ++--
 .../UnsortedMeshedSurface.C                   |  8 ++--
 .../surfaceFormats/nas/NASsurfaceFormat.C     |  2 +-
 .../surfaceFormats/surfaceFormatsCore.C       |  2 +-
 .../chemkinReader/chemkinLexer.L              | 10 ++--
 .../linearValveFvMesh/linearValveFvMesh.C     | 10 ++--
 .../linearValveLayersFvMesh.C                 | 10 ++--
 .../mixerFvMesh/mixerFvMesh.C                 |  8 ++--
 .../movingConeTopoFvMesh.C                    | 12 ++---
 .../meshTriangulation/meshTriangulation.C     |  4 +-
 .../geometricSurfacePatch.C                   |  6 +--
 .../triSurface/interfaces/NAS/readNAS.C       |  2 +-
 .../triSurface/interfaces/TRI/readTRI.C       |  2 +-
 src/triSurface/triSurface/triSurface.C        |  8 ++--
 211 files changed, 713 insertions(+), 832 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 78ac403e99..7573b8f537 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -26,7 +26,7 @@ Application
     PDRFoam
 
 Description
-    Compressible premixed/partially-premixed combustion solver with turbulence 
+    Compressible premixed/partially-premixed combustion solver with turbulence
     modelling.
 
     Combusting RANS code using the b-Xi two-equation model.
@@ -121,7 +121,8 @@ scalar StCoNum = 0.0;
             // Test : disable refinement for some cells
             PackedList<1>& protectedCell =
                 refCast<dynamicRefineFvMesh>(mesh).protectedCell();
-            if (protectedCell.size() == 0)
+
+            if (protectedCell.empty())
             {
                 protectedCell.setSize(mesh.nCells());
                 protectedCell = 0;
@@ -135,7 +136,7 @@ scalar StCoNum = 0.0;
                 }
             }
 
-            //volScalarField pIndicator("pIndicator", 
+            //volScalarField pIndicator("pIndicator",
             //    p*(fvc::laplacian(p))
             //  / (
             //        magSqr(fvc::grad(p))
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 6ad19ab287..82e6f2c4c9 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -413,7 +413,7 @@ bool limitRefinementLevel
         }
     }
 
-    if (addCutCells.size() > 0)
+    if (addCutCells.size())
     {
         // Add cells to cutCells.
 
@@ -479,7 +479,7 @@ void doRefinement
     {
         const labelList& added = addedCells[oldCellI];
 
-        if (added.size() > 0)
+        if (added.size())
         {
             // Give all cells resulting from split the refinement level
             // of the master.
@@ -895,7 +895,7 @@ int main(int argc, char *argv[])
             << "    Selected for refinement :" << cutCells.size() << nl
             << endl;
 
-        if (cutCells.size() == 0)
+        if (cutCells.empty())
         {
             Info<< "Stopping refining since 0 cells selected to be refined ..."
                 << nl << endl;
diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
index a153b0ac66..67fdc0807e 100644
--- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
+++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C
@@ -358,18 +358,21 @@ int main(int argc, char *argv[])
     (
         dict.lookup("facesToTriangulate")
     );
+
     bool cutBoundary =
-            pointsToMove.size() > 0
-         || edgesToSplit.size() > 0
-         || facesToTriangulate.size() > 0;
+    (
+        pointsToMove.size()
+     || edgesToSplit.size()
+     || facesToTriangulate.size()
+    );
 
     List<Pair<point> > edgesToCollapse(dict.lookup("edgesToCollapse"));
 
-    bool collapseEdge = edgesToCollapse.size() > 0;
+    bool collapseEdge = edgesToCollapse.size();
 
     List<Pair<point> > cellsToPyramidise(dict.lookup("cellsToSplit"));
 
-    bool cellsToSplit = cellsToPyramidise.size() > 0;
+    bool cellsToSplit = cellsToPyramidise.size();
 
     //List<Tuple<pointField,point> >
     //  cellsToCreate(dict.lookup("cellsToCreate"));
@@ -523,7 +526,7 @@ int main(int argc, char *argv[])
         Info<< nl << "There was a problem in one of the inputs in the"
             << " dictionary. Not modifying mesh." << endl;
     }
-    else if (cellToPyrCentre.size() > 0)
+    else if (cellToPyrCentre.size())
     {
         Info<< nl << "All input cells located. Modifying mesh." << endl;
 
@@ -555,7 +558,7 @@ int main(int argc, char *argv[])
         Info << "Writing modified mesh to time " << runTime.value() << endl;
         mesh.write();
     }
-    else if (edgeToPos.size() > 0)
+    else if (edgeToPos.size())
     {
         Info<< nl << "All input edges located. Modifying mesh." << endl;
 
diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
index 16747f4134..25b13eba88 100644
--- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
+++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
     )
     {}
 
-    if (refCells.size() > 0)
+    if (refCells.size())
     {
         Info<< "Collected " << refCells.size() << " cells that need to be"
             << " refined to get closer to overall 2:1 refinement level limit"
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index ff6d22940c..4e5b501b85 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C
@@ -652,7 +652,7 @@ int main(int argc, char *argv[])
         // Remove cut cells from cellsToCut  (Note:only relevant if -readSet)
         forAll(cuts.cellLoops(), cellI)
         {
-            if (cuts.cellLoops()[cellI].size() > 0)
+            if (cuts.cellLoops()[cellI].size())
             {
                 //Info<< "Removing cut cell " << cellI << " from wishlist"
                 //    << endl;
diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
index bb0a01fd1b..df84d13a79 100644
--- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
+++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C
@@ -584,7 +584,7 @@ int main(int argc, char *argv[])
 
     forAll (rawPatches, patchI)
     {
-        if (rawPatches[patchI].size() > 0 && cfxPatchTypes[patchI] != "BLKBDY")
+        if (rawPatches[patchI].size() && cfxPatchTypes[patchI] != "BLKBDY")
         {
             // Check if this name has been already created
             label existingPatch = -1;
diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
index b4acf24445..7b385bfe06 100644
--- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -1486,7 +1486,7 @@ int main(int argc, char *argv[])
         }
         defaultBoundaryFaces.shrink();
 
-        if(defaultBoundaryFaces.size() != 0)
+        if (defaultBoundaryFaces.size())
         {
             Warning << " fluent mesh has " << defaultBoundaryFaces.size()
                     << " undefined boundary faces." << endl
@@ -1695,7 +1695,7 @@ int main(int argc, char *argv[])
     // soon negating the need for double output
     if (writeSets)
     {
-        if (cellGroupZoneID.size() > 1 )
+        if (cellGroupZoneID.size() > 1)
         {
             Info<< "Writing cell sets" << endl;
 
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index d3d732205c..62edc15af0 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -667,7 +667,7 @@ void readCells
 
         const labelList& zCells = zoneCells[zoneI];
 
-        if (zCells.size() > 0)
+        if (zCells.size())
         {
             Info<< "    " << zoneI << '\t' << zCells.size() << endl;
         }
@@ -778,7 +778,7 @@ int main(int argc, char *argv[])
 
     forAll(zoneCells, zoneI)
     {
-        if (zoneCells[zoneI].size() > 0)
+        if (zoneCells[zoneI].size())
         {
             nValidCellZones++;
         }
@@ -910,7 +910,7 @@ int main(int argc, char *argv[])
 
         const labelList& zFaces = zoneFaces[zoneI];
 
-        if (zFaces.size() > 0)
+        if (zFaces.size())
         {
             nValidFaceZones++;
 
@@ -940,7 +940,7 @@ int main(int argc, char *argv[])
 
         forAll(zoneCells, zoneI)
         {
-            if (zoneCells[zoneI].size() > 0)
+            if (zoneCells[zoneI].size())
             {
                 label physReg = zoneToPhys[zoneI];
 
@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
 
         forAll(zoneFaces, zoneI)
         {
-            if (zoneFaces[zoneI].size() > 0)
+            if (zoneFaces[zoneI].size())
             {
                 label physReg = zoneToPhys[zoneI];
 
@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (cz.size() > 0 || fz.size() > 0)
+    if (cz.size() || fz.size())
     {
         mesh.addZones(List<pointZone*>(0), fz, cz);
     }
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 477d2ba06c..520be5b146 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -752,7 +752,7 @@ int main(int argc, char *argv[])
     List<faceList> patchFaceVerts;
 
 
-    if (dofVertIndices.size() > 0)
+    if (dofVertIndices.size())
     {
         // Use the vertex constraints to patch. Is of course bit dodgy since
         // face goes on patch if all its vertices are on a constraint.
diff --git a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
index 546aaa7439..6d41c037e6 100644
--- a/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
+++ b/applications/utilities/mesh/conversion/netgenNeutralToFoam/netgenNeutralToFoam.C
@@ -242,7 +242,7 @@ int main(int argc, char *argv[])
     }
 
 
-    if (vertsToBoundary.size() > 0)
+    if (vertsToBoundary.size())
     {
         // Didn't find cells connected to boundary faces.
         WarningIn(args.executable())
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
index 26eb18e26d..3470fd71cc 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/makePolyDualMesh.C
@@ -229,7 +229,7 @@ void simpleMarkFeatures
 
     if (doNotPreserveFaceZones)
     {
-        if (faceZones.size() > 0)
+        if (faceZones.size())
         {
             WarningIn("simpleMarkFeatures(..)")
                 << "Detected " << faceZones.size()
@@ -239,7 +239,7 @@ void simpleMarkFeatures
     }
     else
     {
-        if (faceZones.size() > 0)
+        if (faceZones.size())
         {
             Info<< "Detected " << faceZones.size()
                 << " faceZones. Preserving these by marking their"
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
index 4492a6f6b6..2a307e5df2 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
+++ b/applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
@@ -38,10 +38,7 @@ Class
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(meshDualiser, 0);
-}
+defineTypeNameAndDebug(Foam::meshDualiser, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -735,7 +732,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
                 )   << "Walked from face on patch:" << patchI
                     << " to face:" << faceI
                     << " fc:" << mesh_.faceCentres()[faceI]
-                    << " on patch:" << patches.whichPatch(faceI) 
+                    << " on patch:" << patches.whichPatch(faceI)
                     << abort(FatalError);
             }
 
@@ -886,7 +883,7 @@ Foam::meshDualiser::meshDualiser(const polyMesh& mesh)
     faceToDualPoint_(mesh_.nFaces(), -1),
     edgeToDualPoint_(mesh_.nEdges(), -1)
 {}
-  
+
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
@@ -1083,7 +1080,7 @@ void Foam::meshDualiser::setRefinement
     {
         label pointI = multiCellFeaturePoints[i];
 
-        if (pointToDualCells_[pointI].size() > 0)
+        if (pointToDualCells_[pointI].size())
         {
             FatalErrorIn
             (
@@ -1133,7 +1130,7 @@ void Foam::meshDualiser::setRefinement
     // Normal points
     forAll(mesh_.points(), pointI)
     {
-        if (pointToDualCells_[pointI].size() == 0)
+        if (pointToDualCells_[pointI].empty())
         {
             pointToDualCells_[pointI].setSize(1);
             pointToDualCells_[pointI][0] = meshMod.addCell
@@ -1241,7 +1238,7 @@ void Foam::meshDualiser::setRefinement
             const edge& e = mesh_.edges()[edgeI];
 
             // We need a point on the edge if not all cells on both sides
-            // are the same. 
+            // are the same.
 
             const labelList& eCells = mesh_.edgeCells()[edgeI];
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
index d55d49242d..161123803e 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C
@@ -136,7 +136,7 @@ void sammMesh::readCouples()
 
             forAll (curFaces, faceI)
             {
-                if (curFaces[faceI].size() == 0)
+                if (curFaces[faceI].empty())
                 {
                     zeroSizeFound++;
                 }
@@ -153,7 +153,7 @@ void sammMesh::readCouples()
 
                 forAll (oldFaces, faceI)
                 {
-                    if (oldFaces[faceI].size() > 0)
+                    if (oldFaces[faceI].size())
                     {
                         curFaces[nFaces] = oldFaces[faceI];
 
diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
index c4ff20791a..910df915d8 100644
--- a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
+++ b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
@@ -45,12 +45,11 @@ void starMesh::createCoupleMatches()
     // existing points list
 
     // Estimate the number of cells affected by couple matches
-    const label cellMapSize =
-        min
-        (
-            cellShapes_.size()/10,
-            couples_.size()*2
-        );
+    const label cellMapSize = min
+    (
+        cellShapes_.size()/10,
+        couples_.size()*2
+    );
 
     // Store newly created faces for each cell
     Map<SLList<face> > cellAddedFaces(cellMapSize);
@@ -322,7 +321,7 @@ void starMesh::createCoupleMatches()
 
                                     // A new point is created. Warning:
                                     // using original edge for accuracy.
-                                    // 
+                                    //
                                     coupleFacePoints.append
                                         (P + alpha*curMasterEdge.vec(points_));
                                 }
@@ -338,7 +337,7 @@ void starMesh::createCoupleMatches()
                         // master edge and vice versa. The problem is that
                         // no symmetry exists, i.e. both operations needs
                         // to be done separately for both master and slave
-                        // side. 
+                        // side.
 
                         // Master side
                         // check if the first or second point of slave edge is
@@ -625,11 +624,11 @@ void starMesh::createCoupleMatches()
 
             // Eliminate all zero-length edges
             face newMasterFace(labelList(tmpMasterFace.size(), labelMax));
-          
+
             // insert first point by hand. Careful: the first one is
             // used for comparison to allow the edge collapse across
             // point zero.
-            // 
+            //
             newMasterFace[0] = tmpMasterFace[0];
             label nMaster = 0;
 
@@ -823,7 +822,7 @@ void starMesh::createCoupleMatches()
             // insert first point by hand. Careful: the first one is
             // used for comparison to allow the edge collapse across
             // point zero.
-            // 
+            //
             newSlaveFace[0] = tmpSlaveFace[0];
             label nSlave = 0;
 
@@ -1097,7 +1096,7 @@ void starMesh::createCoupleMatches()
                         << "edges to consider: " << edgesToConsider << endl;
 #                   endif
 
-                    if (edgesToConsider.size() == 0)
+                    if (edgesToConsider.empty())
                     {
                         FatalErrorIn("void starMesh::createCoupleMatches()")
                             << setprecision(12)
@@ -1420,7 +1419,7 @@ void starMesh::createCoupleMatches()
         } // end of arbitrary match
     }
 
-    if (couples_.size() > 0)
+    if (couples_.size())
     {
         // Loop through all cells and reset faces for removal to zero size
         const labelList crfToc = cellRemovedFaces.toc();
@@ -1442,7 +1441,7 @@ void starMesh::createCoupleMatches()
                 cellFaces_[curCell][curRemovedFacesIter()].setSize(0);
             }
 
-            if (curRemovedFaces.size() > 0)
+            if (curRemovedFaces.size())
             {
                 // reset the shape pointer to unknown
                 cellShapes_[curCell] = cellShape(*unknownPtr_, labelList(0));
@@ -1468,7 +1467,7 @@ void starMesh::createCoupleMatches()
             // copy original faces that have not been removed
             forAll (oldFaces, faceI)
             {
-                if (oldFaces[faceI].size() > 0)
+                if (oldFaces[faceI].size())
                 {
                     newFaces[nNewFaces] = oldFaces[faceI];
                     nNewFaces++;
@@ -1491,7 +1490,7 @@ void starMesh::createCoupleMatches()
             // reset the size of the face list
             newFaces.setSize(nNewFaces);
 
-            if (curAddedFaces.size() > 0)
+            if (curAddedFaces.size())
             {
                 // reset the shape pointer to unknown
                 cellShapes_[curCell] = cellShape(*unknownPtr_, labelList(0));
diff --git a/applications/utilities/mesh/conversion/starToFoam/starMesh.C b/applications/utilities/mesh/conversion/starToFoam/starMesh.C
index f5fbb9f860..a495ae0362 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starMesh.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starMesh.C
@@ -264,7 +264,7 @@ starMesh::starMesh
 
     readCouples();
 
-    if (couples_.size() > 0)
+    if (couples_.size())
     {
         createCoupleMatches();
     }
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 4f9c369c7d..7fcf2a586b 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
     {
         nodeStream.getLine(line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     IStringStream nodeLine(line);
 
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
         {
             nodeStream.getLine(line);
 
-            if ((line.size() > 0) && (line[0] != '#'))
+            if (line.size() && line[0] != '#')
             {
                 IStringStream nodeLine(line);
 
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
     {
         eleStream.getLine(line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     IStringStream eleLine(line);
 
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
     {
         eleStream.getLine(line);
 
-        if ((line.size() > 0) && (line[0] != '#'))
+        if (line.size() && line[0] != '#')
         {
             IStringStream eleLine(line);
 
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
         {
             faceStream.getLine(line);
         }
-        while((line.size() > 0) && (line[0] == '#'));
+        while (line.size() && line[0] == '#');
 
         IStringStream faceLine(line);
 
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
         {
             faceStream.getLine(line);
 
-            if ((line.size() > 0) && (line[0] != '#'))
+            if (line.size() && line[0] != '#')
             {
                 IStringStream faceLine(line);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
index 5a273f7acb..640971ada0 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C
@@ -118,7 +118,7 @@ Foam::label Foam::blockMesh::numZonedBlocks() const
 
     forAll(*this, blockI)
     {
-        if (operator[](blockI).blockDef().zoneName().size() > 0)
+        if (operator[](blockI).blockDef().zoneName().size())
         {
             num++;
         }
diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
index 1c3bd34a22..1723fa5101 100644
--- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
+++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
             const labelListList& blockCells = b.cells();
             const word& zoneName = b.blockDef().zoneName();
 
-            if (zoneName.size() > 0)
+            if (zoneName.size())
             {
                 HashTable<label>::const_iterator iter = zoneMap.find(zoneName);
 
diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
index 6d7e80d74e..3347db180b 100644
--- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
+++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.C
@@ -1,6 +1,6 @@
         Info<< "Creating merge patch pairs" << nl << endl;
 
-        if (mergePatchPairs.size() > 0)
+        if (mergePatchPairs.size())
         {
             // Create and add point and face zones and mesh modifiers
             List<pointZone*> pz(mergePatchPairs.size());
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 2596ae6150..de69375595 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -177,7 +177,7 @@ Foam::label Foam::checkTopology
 
             primitivePatch::surfaceTopo pTyp = pp.surfaceType();
 
-            if (pp.size() == 0)
+            if (pp.empty())
             {
                 Pout<< setw(34) << "ok (empty)";
             }
@@ -232,7 +232,7 @@ Foam::label Foam::checkTopology
             Pout<< endl;
         }
 
-        if (points.size() > 0)
+        if (points.size())
         {
             Pout<< "  <<Writing " << points.size()
                 << " conflicting points to set "
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 238d8232f0..d6d58dd542 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -172,7 +172,7 @@ void filterPatches(polyMesh& mesh)
 
         if (isA<processorPolyPatch>(pp))
         {
-            if (pp.size() > 0)
+            if (pp.size())
             {
                 allPatches.append
                 (
@@ -586,7 +586,7 @@ int main(int argc, char *argv[])
     // 1. Add all new patches
     // ~~~~~~~~~~~~~~~~~~~~~~
 
-    if (patchSources.size() > 0)
+    if (patchSources.size())
     {
         // Old and new patches.
         DynamicList<polyPatch*> allPatches(patches.size()+patchSources.size());
diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
index 292d2a0056..616cfb4ce7 100644
--- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
@@ -34,10 +34,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(mergePolyMesh, 1);
-}
+defineTypeNameAndDebug(Foam::mergePolyMesh, 1);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -142,7 +139,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
 
     // Point zones
     wordList curPointZoneNames = pointZones().names();
-    if (curPointZoneNames.size() > 0)
+    if (curPointZoneNames.size())
     {
         pointZoneNames_.setCapacity(2*curPointZoneNames.size());
     }
@@ -155,7 +152,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
     // Face zones
     wordList curFaceZoneNames = faceZones().names();
 
-    if (curFaceZoneNames.size() > 0)
+    if (curFaceZoneNames.size())
     {
         faceZoneNames_.setCapacity(2*curFaceZoneNames.size());
     }
@@ -167,7 +164,7 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
     // Cell zones
     wordList curCellZoneNames = cellZones().names();
 
-    if (curCellZoneNames.size() > 0)
+    if (curCellZoneNames.size())
     {
         cellZoneNames_.setCapacity(2*curCellZoneNames.size());
     }
@@ -333,11 +330,11 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
         newOwn = own[faceI];
         if (newOwn > -1) newOwn = renumberCells[newOwn];
 
-        if (newPatch > -1) 
+        if (newPatch > -1)
         {
             newNei = -1;
-        } 
-        else 
+        }
+        else
         {
             newNei = nei[faceI];
             newNei = renumberCells[newNei];
@@ -373,7 +370,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
                 )
             );
     }
-        
+
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
index dcec2e27bd..07190e49f9 100644
--- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
+++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
@@ -48,7 +48,7 @@ string getLine(std::ifstream& is)
     {
         std::getline(is, line);
     }
-    while((line.size() > 0) && (line[0] == '#'));
+    while (line.size() && line[0] == '#');
 
     return line;
 }
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index de684afe48..95c7973d2c 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
     {
         const labelList& added = oldToNew[oldCellI];
 
-        if (added.size() > 0)
+        if (added.size())
         {
             forAll(added, i)
             {
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 0bfa7b7aba..8f49a94766 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -89,7 +89,7 @@ void backup
     const word& toName
 )
 {
-    if (fromSet.size() > 0)
+    if (fromSet.size())
     {
         Pout<< "    Backing up " << fromName << " into " << toName << endl;
 
@@ -284,7 +284,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         polyMesh::meshSubDir/"sets"
     );
     IOobjectList cellSets(objects.lookupClass(cellSet::typeName));
-    if (cellSets.size() > 0)
+    if (cellSets.size())
     {
         os  << "cellSets:" << endl;
         forAllConstIter(IOobjectList, cellSets, iter)
@@ -294,7 +294,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         }
     }
     IOobjectList faceSets(objects.lookupClass(faceSet::typeName));
-    if (faceSets.size() > 0)
+    if (faceSets.size())
     {
         os  << "faceSets:" << endl;
         forAllConstIter(IOobjectList, faceSets, iter)
@@ -304,7 +304,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
         }
     }
     IOobjectList pointSets(objects.lookupClass(pointSet::typeName));
-    if (pointSets.size() > 0)
+    if (pointSets.size())
     {
         os  << "pointSets:" << endl;
         forAllConstIter(IOobjectList, pointSets, iter)
@@ -347,7 +347,7 @@ bool doCommand
     bool ok = true;
 
     // Set to work on
-    autoPtr<topoSet> currentSetPtr(NULL);
+    autoPtr<topoSet> currentSetPtr;
 
     word sourceType;
 
@@ -383,7 +383,7 @@ bool doCommand
             currentSet.resize(max(currentSet.size(), typSize));
         }
 
-        if (!currentSetPtr.valid())
+        if (currentSetPtr.empty())
         {
             Pout<< "    Cannot construct/load set "
                 << topoSet::localPath(mesh, setName) << endl;
@@ -522,7 +522,7 @@ bool doCommand
 
         Pout<< fIOErr.message().c_str() << endl;
 
-        if (sourceType.size() != 0)
+        if (sourceType.size())
         {
             Pout<< topoSetSource::usage(sourceType).c_str();
         }
@@ -533,7 +533,7 @@ bool doCommand
 
         Pout<< fErr.message().c_str() << endl;
 
-        if (sourceType.size() != 0)
+        if (sourceType.size())
         {
             Pout<< topoSetSource::usage(sourceType).c_str();
         }
@@ -571,7 +571,7 @@ commandStatus parseType
     IStringStream& is
 )
 {
-    if (setType.size() == 0)
+    if (setType.empty())
     {
         Pout<< "Type 'help' for usage information" << endl;
 
@@ -689,7 +689,7 @@ commandStatus parseAction(const word& actionName)
 {
     commandStatus stat = INVALID;
 
-    if (actionName.size() != 0)
+    if (actionName.size())
     {
         try
         {
@@ -792,7 +792,7 @@ int main(int argc, char *argv[])
 
             std::getline(*fileStreamPtr, rawLine);
 
-            if (rawLine.size() > 0)
+            if (rawLine.size())
             {
                 Pout<< "Doing:" << rawLine << endl;
             }
@@ -821,7 +821,7 @@ int main(int argc, char *argv[])
 #           endif
         }
 
-        if (rawLine.size() == 0 || rawLine[0] == '#')
+        if (rawLine.empty() || rawLine[0] == '#')
         {
             continue;
         }
diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
index f71be6ac7d..aef00fe7e9 100644
--- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
+++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C
@@ -100,10 +100,10 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
             << exit(FatalError);
     }
 
-    if (bMesh[patchI].size() != 0)
+    if (bMesh[patchI].size())
     {
         FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
-            << "Patch " << name << " is present but not of zero size"
+            << "Patch " << name << " is present but non-zero size"
             << exit(FatalError);
     }
 }
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index d52403f0b1..e3cb83ad38 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -878,7 +878,7 @@ void createAndWriteRegion
     {
         const polyPatch& pp = newPatches[patchI];
 
-        if (isA<processorPolyPatch>(pp) && pp.size() > 0)
+        if (isA<processorPolyPatch>(pp) && pp.size())
         {
             oldToNew[patchI] = newI++;
         }
@@ -1049,7 +1049,7 @@ label findCorrespondingZone
 
     labelList regionCells = findIndices(cellRegion, regionI);
 
-    if (regionCells.size() == 0)
+    if (regionCells.empty())
     {
         // My local portion is empty. Maps to any empty cellZone. Mark with
         // special value which can get overwritten by other processors.
@@ -1200,7 +1200,7 @@ int main(int argc, char *argv[])
     boolList blockedFace;
 
     // Read from faceSet
-    if (blockedFacesName.size() > 0)
+    if (blockedFacesName.size())
     {
         faceSet blockedFaceSet(mesh, blockedFacesName);
         Info<< "Read " << returnReduce(blockedFaceSet.size(), sumOp<label>())
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
index 54e3cd1b78..4773654752 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
+++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
@@ -82,7 +82,7 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name)
             << exit(FatalError);
     }
 
-    if (bMesh[patchI].size() == 0)
+    if (bMesh[patchI].empty())
     {
         FatalErrorIn("checkPatch(const polyBoundaryMesh&, const word&)")
             << "Patch " << name << " is present but zero size"
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 208066016e..4b50082e10 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
     );
 
 
-    if (args.options().size() == 0)
+    if (args.options().empty())
     {
         FatalErrorIn(args.executable())
             << "No options supplied, please use one or more of "
diff --git a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C b/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
index bfe9e585da..ad78b2a914 100644
--- a/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
+++ b/applications/utilities/parallelProcessing/decomposePar/distributeCells.C
@@ -104,7 +104,7 @@ void domainDecomposition::distributeCells()
         }
     }
 
-    if (sameProcFaces.size() > 0)
+    if (sameProcFaces.size())
     {
         Info<< "Selected " << sameProcFaces.size()
             << " faces whose owner and neighbour cell should be kept on the"
@@ -123,7 +123,7 @@ void domainDecomposition::distributeCells()
         *this
     );
 
-    if (sameProcFaces.size() == 0)
+    if (sameProcFaces.empty())
     {
         cellToProc_ = decomposePtr().decompose(cellCentres());
     }
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 9e686f9b2e..9e250916cd 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
         args
     );
 
-    if (!timeDirs.size())
+    if (timeDirs.empty())
     {
         FatalErrorIn(args.executable())
             << "No times selected"
@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
         }
 
 
-        if (cloudObjects.size() > 0)
+        if (cloudObjects.size())
         {
             // Pass2: reconstruct the cloud
             forAllConstIter(HashTable<IOobjectList>, cloudObjects, iter)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index e7b481adc2..980a3c6153 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -558,7 +558,7 @@ void ensightFieldAscii
 
     GeometricField<Type, fvPatchField, volMesh> vf(fieldObject, mesh);
 
-    if (!patchNames.size())
+    if (patchNames.empty())
     {
         if (Pstream::master())
         {
@@ -633,7 +633,7 @@ void ensightFieldAscii
         const word& patchName = iter.key();
         const labelList& patchProcessors = iter();
 
-        if (!patchNames.size() || patchNames.found(patchName))
+        if (patchNames.empty() || patchNames.found(patchName))
         {
             if (patchIndices.found(patchName))
             {
@@ -734,7 +734,7 @@ void ensightFieldBinary
 
     GeometricField<Type, fvPatchField, volMesh> vf(fieldObject, mesh);
 
-    if (!patchNames.size())
+    if (patchNames.empty())
     {
         if (Pstream::master())
         {
@@ -805,7 +805,7 @@ void ensightFieldBinary
         const word& patchName = iter.key();
         const labelList& patchProcessors = iter();
 
-        if (!patchNames.size() || patchNames.found(patchName))
+        if (patchNames.empty() || patchNames.found(patchName))
         {
             if (patchIndices.found(patchName))
             {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
index 537fa7d075..b69a9264c1 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
@@ -129,7 +129,7 @@ Foam::ensightMesh::ensightMesh
     {
         wordList patchNameList(IStringStream(args.options()["patches"])());
 
-        if (!patchNameList.size())
+        if (patchNameList.empty())
         {
             patchNameList = allPatchNames_.toc();
         }
@@ -163,7 +163,7 @@ Foam::ensightMesh::ensightMesh
     label nHexes = 0;
     label nPolys = 0;
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         forAll(cellShapes, celli)
         {
@@ -267,7 +267,7 @@ Foam::ensightMesh::ensightMesh
         const word& patchName = iter.key();
         nFacePrimitives nfp;
 
-        if (!patchNames_.size() || patchNames_.found(patchName))
+        if (patchNames_.empty() || patchNames_.found(patchName))
         {
             if (patchIndices_.found(patchName))
             {
@@ -403,7 +403,7 @@ void Foam::ensightMesh::writePrimsBinary
 
     numElem = cellShapes.size();
 
-    if (cellShapes.size() > 0)
+    if (cellShapes.size())
     {
         // All the cellShapes have the same number of elements!
         int numIntElem = cellShapes.size()*cellShapes[0].size();
@@ -917,7 +917,7 @@ void Foam::ensightMesh::writeAscii
 
     labelList pointOffsets(Pstream::nProcs(), 0);
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         label nPoints = points.size();
         Pstream::gather(nPoints, sumOp<label>());
@@ -1044,7 +1044,7 @@ void Foam::ensightMesh::writeAscii
     {
         const labelList& patchProcessors = iter();
 
-        if (!patchNames_.size() || patchNames_.found(iter.key()))
+        if (patchNames_.empty() || patchNames_.found(iter.key()))
         {
             const word& patchName = iter.key();
             const nFacePrimitives& nfp = nPatchPrims_.find(patchName)();
@@ -1244,7 +1244,7 @@ void Foam::ensightMesh::writeBinary
 
     labelList pointOffsets(Pstream::nProcs(), 0);
 
-    if (!patchNames_.size())
+    if (patchNames_.empty())
     {
         label nPoints = points.size();
         Pstream::gather(nPoints, sumOp<label>());
@@ -1373,7 +1373,7 @@ void Foam::ensightMesh::writeBinary
         iCount ++;
         const labelList& patchProcessors = iter();
 
-        if (!patchNames_.size() || patchNames_.found(iter.key()))
+        if (patchNames_.empty() || patchNames_.found(iter.key()))
         {
             const word& patchName = iter.key();
             const nFacePrimitives& nfp = nPatchPrims_.find(patchName)();
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
index 8e3faa359f..f5d7477530 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightWriteBinary.C
@@ -57,7 +57,7 @@ void writeEnsDataBinary
     std::ofstream& ensightFile
 )
 {
-    if (sf.size() > 0)
+    if (sf.size())
     {
         List<float> temp(sf.size());
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
index 3a4d626efb..6c640b41fa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/validateFields.H
@@ -77,9 +77,9 @@ forAllIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
         }
     }
 
-    if (!cloudIter().size())
+    if (cloudIter().empty())
     {
-        Info<< "removing cloud " << cloudName<< endl;
+        Info<< "removing cloud " << cloudName << endl;
         cloudFields.erase(cloudIter);
     }
 }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index 63f9a45ee7..81ac4facac 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
 #   include "getFieldNames.H"
 
     bool hasLagrangian = false;
-    if ((sprayScalarNames.size() > 0) || (sprayVectorNames.size() > 0))
+    if (sprayScalarNames.size() || sprayVectorNames.size())
     {
         hasLagrangian = true;
     }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
index 45d5b3fc2f..76f834c431 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
@@ -80,7 +80,7 @@ for(label i=0; i < nTypes; i++)
             wordList lagrangianScalarNames = objects.names("scalarField");
             wordList lagrangianVectorNames = objects.names("vectorField");
 
-            if (particles.size() > 0)
+            if (particles.size())
             {
 #               include "gmvOutputLagrangian.H"
             }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
index 4fa7ee1ec5..89c126c1e3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
@@ -49,16 +49,11 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
         gmvFile << name  << nl;
 
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             gmvFile << s[n] << token::SPACE;
         }
@@ -85,16 +80,11 @@ forAll(lagrangianVectorNames, i)
         )
     );
 
-    if (v.size() != 0)
+    if (v.size())
     {
         gmvFile << name + "x" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].x() << token::SPACE;
         }
@@ -102,12 +92,7 @@ forAll(lagrangianVectorNames, i)
 
         gmvFile << name + "y" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].y() << token::SPACE;
         }
@@ -115,19 +100,13 @@ forAll(lagrangianVectorNames, i)
 
         gmvFile << name + "z" << nl;
 
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
             gmvFile << v[n].z() << token::SPACE;
         }
         gmvFile << nl;
     }
 
-
 }
 
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
index 682f9e27e0..f5d5b3c8c6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
@@ -47,16 +47,11 @@ forAll(lagrangianScalarNames, i)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
         gmvFile << name  << nl;
 
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             gmvFile << s[n] << token::SPACE;
         }
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index e60ebc1448..45c5f37996 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
         (
             args.options().found("time")
          || args.options().found("latestTime")
-         || cellSetName.size() > 0
+         || cellSetName.size()
          || regionName != polyMesh::defaultRegion
         )
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
index 27d8fa0e97..838d5e2971 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
@@ -58,7 +58,7 @@ void readFields
         ++iter
     )
     {
-        if (!selectedFields.size() || selectedFields.found(iter()->name()))
+        if (selectedFields.empty() || selectedFields.found(iter()->name()))
         {
             fields.set
             (
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
index 7552e07e27..b8376e2a99 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.C
@@ -47,7 +47,7 @@ Foam::vtkMesh::vtkMesh
     subsetter_(baseMesh),
     setName_(setName)
 {
-    if (setName.size() > 0)
+    if (setName.size())
     {
         // Read cellSet using whole mesh
         cellSet currentSet(baseMesh_, setName_);
@@ -71,7 +71,7 @@ Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate()
 
         topoPtr_.clear();
 
-        if (setName_.size() > 0)
+        if (setName_.size())
         {
             Info<< "Subsetting mesh based on cellSet " << setName_ << endl;
 
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
index 7e6f411699..d2b1e9f0e3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/vtkMesh.H
@@ -105,13 +105,13 @@ public:
             //- Check if running subMesh
             bool useSubMesh() const
             {
-                return setName_.size() > 0;
+                return setName_.size();
             }
 
             //- topology
             const vtkTopo& topo() const
             {
-                if (!topoPtr_.valid())
+                if (topoPtr_.empty())
                 {
                     topoPtr_.reset(new vtkTopo(mesh()));
                 }
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index a26ba88a5c..cb25ac5089 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -154,6 +154,11 @@ class vtkPV3Foam
                 return size_;
             }
 
+            bool empty() const
+            {
+                return (size_ == 0);
+            }
+
             void reset()
             {
                 start_ = -1;
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index 74bcac3b78..f01839a930 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -147,14 +147,14 @@ int USERD_set_filenames
     
     bool lagrangianNamesFound = false;
     label n = 0;
-    while ((!lagrangianNamesFound) && (n<Num_time_steps))
+    while (!lagrangianNamesFound && n < Num_time_steps)
     {
         runTime.setTime(TimeList[n+1], n+1);
 
         Cloud<passiveParticle> lagrangian(*meshPtr);
 
         n++;
-        if (lagrangian.size()>0)
+        if (lagrangian.size())
         {
             lagrangianNamesFound = true;
         }
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
index de8f4ffaf9..e9259e3cc7 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H
@@ -4,7 +4,6 @@ nVar -= Num_variables - nSprayVariables;
 
 if (nVar >= 0)
 {
-    
     word name = lagrangianScalarNames[nVar];
 
     IOField<scalar> s
@@ -20,15 +19,9 @@ if (nVar >= 0)
         )
     );
 
-    if (s.size() != 0)
+    if (s.size())
     {
-
-        for
-        (
-            label n = 0;
-            n < s.size();
-            n++
-        )
+        for (label n = 0; n < s.size(); n++)
         {
             var_array[n+1] = s[n];
         }
@@ -36,7 +29,7 @@ if (nVar >= 0)
 }
 else
 {
-    //Info << "getLagrangianScalar: nVar = " << nVar << endl;
+    // Info << "getLagrangianScalar: nVar = " << nVar << endl;
     return Z_UNDEF;
 }
 
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
index 59f2806a32..42fcc8560f 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianVector.H
@@ -21,16 +21,10 @@ if (nVar >= 0)
         )
     );
 
-    if (v.size() != 0)
+    if (v.size())
     {
-        for
-        (
-            label n = 0;
-            n < v.size();
-            n++
-        )
+        for (label n = 0; n < v.size(); n++)
         {
-
             if (component == 0)
             {
                 var_array[n+1] = v[n].x();
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index 604046862d..10b29fc8b3 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -235,7 +235,7 @@ static void createFieldNames
     HashSet<word> surfScalarHash;
     HashSet<word> surfVectorHash;
 
-    if (setName.size() == 0)
+    if (setName.empty())
     {
         forAll(Times, timeI)
         {
@@ -536,13 +536,12 @@ void user_query_file_function
     fileName caseName(rootAndCase.name());
 
     // handle trailing '/'
-    if (caseName.size() == 0)
+    if (caseName.empty())
     {
         caseName = rootDir.name();
-        rootDir = rootDir.path();
+        rootDir  = rootDir.path();
     }
 
-
     Info<< "rootDir  : " << rootDir << endl
         << "caseName : " << caseName << endl
         << "setName  : " << setName << endl;
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
index 82d49c1135..09f63f50da 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
@@ -150,7 +150,7 @@ const Foam::fvMesh& Foam::readerDatabase::mesh() const
             << "No mesh set" << abort(FatalError);
     }
 
-    if (setName_.size() == 0)
+    if (setName_.empty())
     {
         return *meshPtr_;
     }
@@ -265,7 +265,7 @@ void Foam::readerDatabase::loadMesh()
         IOobject::AUTO_WRITE
     );
 
-    if (setName_.size() != 0)
+    if (setName_.size())
     {
         Info<< "Subsetting mesh based on cellSet " << setName_ << endl;
 
@@ -294,9 +294,9 @@ Foam::polyMesh::readUpdateState Foam::readerDatabase::setTime
         // Update loaded mesh
         meshChange = meshPtr_->readUpdate();
 
-        if ((setName_.size() != 0) && (meshChange != polyMesh::UNCHANGED))
+        if (setName_.size() && meshChange != polyMesh::UNCHANGED)
         {
-            Info<< "Subsetting mesh based on " << setName_ << endl;        
+            Info<< "Subsetting mesh based on " << setName_ << endl;
 
             fvMeshSubset& mesh = *meshPtr_;
 
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index 6f593c1309..e57aa9761c 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -206,7 +206,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             // Do closer inspection for unmapped particles
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            if (unmappedSource.size() > 0)
+            if (unmappedSource.size())
             {
                 meshSearch targetSearcher(meshTarget, false);
 
@@ -237,7 +237,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
             Info<< "    after additional mesh searching found "
                 << targetParcels.size() << " parcels in target mesh." << endl;
 
-            if (addParticles.size() > 0)
+            if (addParticles.size())
             {
                 IOPosition<passiveParticle>(targetParcels).write();
 
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 6ad1a6e950..e7b7890074 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -242,9 +242,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        illegalFaces.shrink();
-
-        if (illegalFaces.size() > 0)
+        if (illegalFaces.size())
         {
             Pout<< "Surface has " << illegalFaces.size()
                 << " illegal triangles." << endl;
@@ -628,7 +626,7 @@ int main(int argc, char *argv[])
         triSurfaceSearch querySurf(surf);
         surfaceIntersection inter(querySurf);
 
-        if ((inter.cutEdges().size() == 0) && (inter.cutPoints().size() == 0))
+        if (inter.cutEdges().empty() && inter.cutPoints().empty())
         {
             Pout<< "Surface is not self-intersecting" << endl;
         }
diff --git a/applications/utilities/surface/surfaceClean/collapseBase.C b/applications/utilities/surface/surfaceClean/collapseBase.C
index 4c4f366af4..58168e5722 100644
--- a/applications/utilities/surface/surfaceClean/collapseBase.C
+++ b/applications/utilities/surface/surfaceClean/collapseBase.C
@@ -860,7 +860,7 @@ label collapseBase(triSurface& surf, const scalar minLen)
                     splitWeights
                 );
 
-                if (splitVerts.size() > 0)
+                if (splitVerts.size())
                 {
                     // Split edge using splitVerts. All non-collapsed triangles 
                     // using edge will get split.
diff --git a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
index 6daf7928a3..046f9cefe8 100644
--- a/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
+++ b/applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
@@ -49,9 +49,9 @@ void readNASEdges
     edgeList& allEdges
 )
 {
-   IFstream OBJfile(inFileName);
+    IFstream is(inFileName);
 
-    if (!OBJfile.good())
+    if (!is.good())
     {
         FatalErrorIn("readNASEdges")
             << "Cannot read file " << inFileName
@@ -68,14 +68,14 @@ void readNASEdges
     DynamicList<label> edgeIndices;
 
 
-    while (OBJfile.good())
+    while (is.good())
     {
         string line;
-        OBJfile.getLine(line);
+        is.getLine(line);
 
-        if (line.size() > 0 && line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
-            // Skip comment
+            // Skip empty and comment
             continue;
         }
 
@@ -87,9 +87,9 @@ void readNASEdges
             while (true)
             {
                 string buf;
-                OBJfile.getLine(buf);
+                is.getLine(buf);
 
-                if (buf.size() > 72 && buf[72]=='+')
+                if (buf.size() > 72 && buf[72] == '+')
                 {
                     line += buf.substr(8, 64);
                 }
diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
index fa5f26ae30..71ab4c8b01 100644
--- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
+++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
         word patchName = pp.name();
 
-        if (patchName.size() == 0)
+        if (patchName.empty())
         {
             patchName = "patch" + Foam::name(patchI);
         }
diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
index 2ffc384aa0..1c1a725cad 100644
--- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C
+++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
         meshSubsetDict.lookup("zone")
     );
 
-    if ((markedZone.size() != 0) && (markedZone.size() != 2))
+    if (markedZone.size() && markedZone.size() != 2)
     {
         FatalErrorIn(args.executable())
             << "zone specification should be two points, min and max of "
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
     // pick up faces connected to "localPoints"
     //
 
-    if (markedPoints.size() > 0)
+    if (markedPoints.size())
     {
         Info << "Found " << markedPoints.size() << " marked point(s)." << endl;
 
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
     // pick up faces connected to "edges"
     //
 
-    if (markedEdges.size() > 0)
+    if (markedEdges.size())
     {
         Info << "Found " << markedEdges.size() << " marked edge(s)." << endl;
 
@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
     // Number of additional faces picked up because of addFaceNeighbours
     label nFaceNeighbours = 0;
 
-    if (markedFaces.size() > 0)
+    if (markedFaces.size())
     {
         Info << "Found " << markedFaces.size() << " marked face(s)." << endl;
 
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 7d5bc0e1bd..cf1020009b 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
     Info<< "Writing surf to " << outFileName << " ..." << endl;
 
 
-    if (args.options().size() == 0)
+    if (args.options().empty())
     {
         FatalErrorIn(args.executable())
             << "No options supplied, please use one or more of "
diff --git a/src/OSspecific/Unix/Unix.C b/src/OSspecific/Unix/Unix.C
index fa92f10b27..659eca203e 100644
--- a/src/OSspecific/Unix/Unix.C
+++ b/src/OSspecific/Unix/Unix.C
@@ -284,7 +284,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
 bool Foam::mkDir(const fileName& pathName, mode_t mode)
 {
     // empty names are meaningless
-    if (!pathName.size())
+    if (pathName.empty())
     {
         return false;
     }
@@ -567,10 +567,10 @@ Foam::fileNameList Foam::readDir
         {
             fileName fName(list->d_name);
 
-            // ignore files begining with ., i.e. ., .. and .??*
-            if (fName.size() > 0 && fName[size_t(0)] != '.')
+            // ignore files begining with ., i.e. '.', '..' and '.*'
+            if (fName.size() && fName[0] != '.')
             {
-                word fileNameExt = fName.ext();
+                word fExt = fName.ext();
 
                 if
                 (
@@ -578,11 +578,11 @@ Foam::fileNameList Foam::readDir
                  ||
                     (
                         type == fileName::FILE
-                        && fName[fName.size()-1] != '~'
-                        && fileNameExt != "bak"
-                        && fileNameExt != "BAK"
-                        && fileNameExt != "old"
-                        && fileNameExt != "save"
+                     && fName[fName.size()-1] != '~'
+                     && fExt != "bak"
+                     && fExt != "BAK"
+                     && fExt != "old"
+                     && fExt != "save"
                     )
                 )
                 {
@@ -593,7 +593,7 @@ Foam::fileNameList Foam::readDir
                             dirEntries.setSize(dirEntries.size() + maxNnames);
                         }
 
-                        if (filtergz && fileNameExt == "gz")
+                        if (filtergz && fExt == "gz")
                         {
                             dirEntries[nEntries++] = fName.lessExt();
                         }
@@ -616,17 +616,17 @@ Foam::fileNameList Foam::readDir
 }
 
 
-// Copy, recursively if necessary, the source top the destination
+// Copy, recursively if necessary, the source to the destination
 bool Foam::cp(const fileName& src, const fileName& dest)
 {
-    fileName destFile(dest);
-
     // Make sure source exists.
     if (!exists(src))
     {
         return false;
     }
 
+    fileName destFile(dest);
+
     // Check type of source file.
     if (src.type() == fileName::FILE)
     {
@@ -676,7 +676,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
             destFile = destFile/src.component(src.components().size() -1);
         }
 
-        // Make sure the destination directory extists.
+        // Make sure the destination directory exists.
         if (!dir(destFile) && !mkDir(destFile))
         {
             return false;
diff --git a/src/OSspecific/Unix/printStack.C b/src/OSspecific/Unix/printStack.C
index 30a1ef8863..a6c2743298 100644
--- a/src/OSspecific/Unix/printStack.C
+++ b/src/OSspecific/Unix/printStack.C
@@ -149,7 +149,7 @@ void getSymbolForRaw
     const word& address
 )
 {
-    if (filename.size() > 0 && filename[0] == '/')
+    if (filename.size() && filename[0] == '/')
     {
         string fcnt = pOpen
         (
@@ -189,7 +189,7 @@ void error::printStack(Ostream& os)
             string::size_type space = line.rfind(' ') + 1;
             fileName libPath = line.substr(space, line.size()-space);
 
-            if (libPath.size() > 0 && libPath[0] == '/')
+            if (libPath.size() && libPath[0] == '/')
             {
                 string offsetString(line.substr(0, line.find('-')));
                 IStringStream offsetStr(offsetString);
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 992205afaf..3ba659c83d 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -476,8 +476,8 @@ void Foam::StaticHashTable<T, Key, Hash>::operator=
     }
 
 
-    // could be zero-sized from a previous transfer()
-    if (keys_.size() == 0)
+    // keys could be empty from a previous transfer()
+    if (keys_.empty())
     {
         keys_.setSize(rhs.keys_.size());
         objects_.setSize(keys_.size());
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 93317105a8..d9bfaae0b8 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -328,7 +328,7 @@ Foam::StaticHashTable<T, Key, Hash>::begin()
     // Find first non-empty entry
     forAll(keys_, hashIdx)
     {
-        if (keys_[hashIdx].size() > 0)
+        if (keys_[hashIdx].size())
         {
             return iterator(*this, hashIdx, 0);
         }
@@ -360,7 +360,7 @@ Foam::StaticHashTable<T, Key, Hash>::begin() const
     // Find first non-empty entry
     forAll(keys_, hashIdx)
     {
-        if (keys_[hashIdx].size() > 0)
+        if (keys_[hashIdx].size())
         {
             return const_iterator(*this, hashIdx, 0);
         }
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index c7cf618589..9f923d8fce 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -52,7 +52,7 @@ Foam::IOobjectList::IOobjectList
     {
         newInstance = db.time().findInstancePath(instant(instance));
 
-        if (!newInstance.size())
+        if (newInstance.empty())
         {
             return;
         }
@@ -181,7 +181,7 @@ Foam::wordList Foam::IOobjectList::names() const
 {
     wordList objectNames(size());
 
-    label count=0;
+    label count = 0;
     for
     (
         HashPtrTable<IOobject>::const_iterator iter = begin();
@@ -200,7 +200,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
 {
     wordList objectNames(size());
 
-    label count=0;
+    label count = 0;
     for
     (
         HashPtrTable<IOobject>::const_iterator iter = begin();
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index 18cf8b891a..b4be5d37fe 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -42,7 +42,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
     ifPtr_(NULL),
     compression_(IOstream::UNCOMPRESSED)
 {
-    if (!pathname.size())
+    if (pathname.empty())
     {
         if (IFstream::debug)
         {
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index b78e5f07de..bc6c2a03cc 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -46,7 +46,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
 :
     ofPtr_(NULL)
 {
-    if (!pathname.size())
+    if (pathname.empty())
     {
         if (OFstream::debug)
         {
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
index bb4258af11..8e754ce2fd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/OPstream.C
@@ -136,18 +136,18 @@ Foam::Ostream& Foam::OPstream::write(const char* str)
 {
     word nonWhiteChars(string::validate<word>(str));
 
-    if (nonWhiteChars.size() == 0)
-    {
-        return *this;
-    }
-    else if (nonWhiteChars.size() == 1)
+    if (nonWhiteChars.size() == 1)
     {
         return write(nonWhiteChars.c_str()[1]);
     }
-    else
+    else if (nonWhiteChars.size())
     {
         return write(nonWhiteChars);
     }
+    else
+    {
+        return *this;
+    }
 }
 
 
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 01ed2e67aa..8b91422fac 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -236,7 +236,7 @@ Foam::List<Foam::instant> Foam::timeSelector::select0
 {
     instantList timeDirs = timeSelector::select(runTime.times(), args);
 
-    if (!timeDirs.size())
+    if (timeDirs.empty())
     {
         FatalErrorIn(args.executable())
             << "No times selected"
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 27a4dcc1bb..8acc6e71ff 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -46,7 +46,7 @@ bool Foam::dictionary::findInPatterns
     DLList<autoPtr<regExp> >::const_iterator& reLink
 ) const
 {
-    if (patternEntries_.size() > 0)
+    if (patternEntries_.size())
     {
         while (wcLink != patternEntries_.end())
         {
@@ -76,7 +76,7 @@ bool Foam::dictionary::findInPatterns
     DLList<autoPtr<regExp> >::iterator& reLink
 )
 {
-    if (patternEntries_.size() > 0)
+    if (patternEntries_.size())
     {
         while (wcLink != patternEntries_.end())
         {
@@ -240,7 +240,7 @@ bool Foam::dictionary::found(const word& keyword, bool recursive) const
     }
     else
     {
-        if (patternEntries_.size() > 0)
+        if (patternEntries_.size())
         {
             DLList<entry*>::const_iterator wcLink = patternEntries_.begin();
             DLList<autoPtr<regExp> >::const_iterator reLink =
@@ -276,7 +276,7 @@ const Foam::entry* Foam::dictionary::lookupEntryPtr
 
     if (iter == hashedEntries_.end())
     {
-        if (patternMatch && patternEntries_.size() > 0)
+        if (patternMatch && patternEntries_.size())
         {
             DLList<entry*>::const_iterator wcLink =
                 patternEntries_.begin();
@@ -315,7 +315,7 @@ Foam::entry* Foam::dictionary::lookupEntryPtr
 
     if (iter == hashedEntries_.end())
     {
-        if (patternMatch && patternEntries_.size() > 0)
+        if (patternMatch && patternEntries_.size())
         {
             DLList<entry*>::iterator wcLink =
                 patternEntries_.begin();
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 257876eed5..be5977ee06 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -113,15 +113,19 @@ Foam::dictionary& Foam::primitiveEntry::dict()
 }
 
 
-void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
+void Foam::primitiveEntry::insert
+(
+    const tokenList& varTokens,
+    const label posI
+)
 {
     tokenList& tokens = *this;
 
-    if (!varTokens.size())
+    if (varTokens.empty())
     {
         label end = tokens.size() - 1;
 
-        for(label j=i; j<end; j++)
+        for (label j=posI; j<end; j++)
         {
             tokens[j] = tokens[j+1];
         }
@@ -135,7 +139,7 @@ void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
         label end = tokens.size() - 1;
         label offset = varTokens.size() - 1;
 
-        for(label j=end; j>i; j--)
+        for (label j=end; j>posI; j--)
         {
             tokens[j] = tokens[j-offset];
         }
@@ -143,7 +147,7 @@ void Foam::primitiveEntry::insert(const tokenList& varTokens, const label i)
 
     forAll(varTokens, j)
     {
-        tokens[i + j] = varTokens[j];
+        tokens[posI + j] = varTokens[j];
     }
 }
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 93f1534ff1..c5189c1520 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -58,7 +58,7 @@ namespace Foam
 class dictionary;
 
 /*---------------------------------------------------------------------------*\
-                           Class primitiveEntry Declaration
+                       Class primitiveEntry Declaration
 \*---------------------------------------------------------------------------*/
 
 class primitiveEntry
@@ -99,8 +99,8 @@ public:
         //- Read the complete entry from the given stream
         void readEntry(const dictionary&, Istream&);
 
-        //- Insert the given tokens at token i
-        void insert(const tokenList&, const label i);
+        //- Insert the given tokens at token posI
+        void insert(const tokenList&, const label posI);
 
 
 public:
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 98b9c9dd1b..1ca027b247 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -55,7 +55,7 @@ bool regIOobject::writeObject
         return false;
     }
 
-    if (!instance().size())
+    if (instance().empty())
     {
         SeriousErrorIn("regIOobject::write()")
             << "instance undefined for object " << name()
diff --git a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
index 062735bf26..a157dee0a0 100644
--- a/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
+++ b/src/OpenFOAM/fields/Fields/symmTensorField/symmTensorField.C
@@ -50,7 +50,7 @@ UNARY_FUNCTION(symmTensor, symmTensor, cof)
 
 void inv(Field<symmTensor>& tf, const UList<symmTensor>& tf1)
 {
-    if (!tf.size())
+    if (tf.empty())
     {
         return;
     }
diff --git a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
index 5596d1fdd7..a2dbccb3fc 100644
--- a/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
+++ b/src/OpenFOAM/fields/Fields/tensorField/tensorField.C
@@ -49,7 +49,7 @@ UNARY_FUNCTION(tensor, tensor, cof)
 
 void inv(Field<tensor>& tf, const UList<tensor>& tf1)
 {
-    if (!tf.size())
+    if (tf.empty())
     {
         return;
     }
diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
index 7d5a76ca72..534cb5e107 100644
--- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
+++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C
@@ -312,7 +312,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const
             if
             (
                 m < directHitTol                            // Direct hit
-             || neighbours.size() == 0
+             || neighbours.empty()
             )
             {
                 faceWeights.set(faceI, new scalarField(1));
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index e721118db2..bebfcb64fb 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -73,7 +73,7 @@ labelList bandCompression(const labelListList& cellCellAddressing)
             // neighbours. If the neighbour in question has not been visited,
             // add it to the end of the nextCell list
 
-            while (nextCell.size() > 0)
+            while (nextCell.size())
             {
                 currentCell = nextCell.removeHead();
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.C b/src/OpenFOAM/meshes/boundBox/boundBox.C
index 9ff80d26fa..15de6f2cf7 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.C
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.C
@@ -50,7 +50,7 @@ const Foam::boundBox Foam::boundBox::invertedBox
 
 void Foam::boundBox::calculate(const pointField& points, const bool doReduce)
 {
-    if (points.size() == 0)
+    if (points.empty())
     {
         min_ = point::zero;
         max_ = point::zero;
diff --git a/src/OpenFOAM/meshes/meshTools/matchPoints.C b/src/OpenFOAM/meshes/meshTools/matchPoints.C
index ad8726ea2b..826a0185b5 100644
--- a/src/OpenFOAM/meshes/meshTools/matchPoints.C
+++ b/src/OpenFOAM/meshes/meshTools/matchPoints.C
@@ -49,7 +49,7 @@ bool Foam::matchPoints
 
     if (origin == point(VGREAT, VGREAT, VGREAT))
     {
-        if (pts1.size() > 0)
+        if (pts1.size())
         {
             compareOrigin = sum(pts1)/pts1.size();
         }
diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C
index 19f544d64e..a4a82386b8 100644
--- a/src/OpenFOAM/meshes/meshTools/mergePoints.C
+++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C
@@ -44,7 +44,7 @@ bool Foam::mergePoints
 
     if (origin == point(VGREAT, VGREAT, VGREAT))
     {
-        if (points.size() > 0)
+        if (points.size())
         {
             compareOrigin = sum(points)/points.size();
         }
@@ -57,7 +57,7 @@ bool Foam::mergePoints
     // Storage for merged points
     newPoints.setSize(points.size());
 
-    if (points.size() == 0)
+    if (points.empty())
     {
         return false;
     }
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 59b547490e..2cfd6e848c 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -97,7 +97,7 @@ void Foam::pointMapper::calcAddressing() const
 
             label pointI = cfc[cfcI].index();
 
-            if (addr[pointI].size() > 0)
+            if (addr[pointI].size())
             {
                 FatalErrorIn("void pointMapper::calcAddressing() const")
                     << "Master point " << pointI
@@ -118,7 +118,7 @@ void Foam::pointMapper::calcAddressing() const
 
         forAll (cm, pointI)
         {
-            if (cm[pointI] > -1 && addr[pointI].size() == 0)
+            if (cm[pointI] > -1 && addr[pointI].empty())
             {
                 // Mapped from a single point
                 addr[pointI] = labelList(1, cm[pointI]);
@@ -135,7 +135,7 @@ void Foam::pointMapper::calcAddressing() const
 
         forAll (addr, pointI)
         {
-            if (addr[pointI].size() == 0)
+            if (addr[pointI].empty())
             {
                 // Mapped from a dummy point. Take point 0 with weight 1.
                 addr[pointI] = labelList(1, 0);
@@ -175,7 +175,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
     insertedPointLabelsPtr_(NULL)
 {
     // Check for possibility of direct mapping
-    if (mpm_.pointsFromPointsMap().size() == 0)
+    if (mpm_.pointsFromPointsMap().empty())
     {
         direct_ = true;
     }
@@ -185,7 +185,7 @@ Foam::pointMapper::pointMapper(const pointMesh& pMesh, const mapPolyMesh& mpm)
     }
 
     // Check for inserted points
-    if (direct_ && (mpm_.pointMap().size() == 0 || min(mpm_.pointMap()) > -1))
+    if (direct_ && (mpm_.pointMap().empty() || min(mpm_.pointMap()) > -1))
     {
         insertedPoints_ = false;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index b6b4bccf81..dc1930a5e0 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -86,7 +86,7 @@ void Foam::cellMapper::calcAddressing() const
 
         weightsPtr_ = new scalarListList(mesh_.nCells());
         scalarListList& w = *weightsPtr_;
-        
+
         const List<objectMap>& cfp = mpm_.cellsFromPointsMap();
 
         forAll (cfp, cfpI)
@@ -96,7 +96,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfp[cfpI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -118,7 +118,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfe[cfeI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -140,7 +140,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cff[cffI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -162,7 +162,7 @@ void Foam::cellMapper::calcAddressing() const
 
             label cellI = cfc[cfcI].index();
 
-            if (addr[cellI].size() > 0)
+            if (addr[cellI].size())
             {
                 FatalErrorIn("void cellMapper::calcAddressing() const")
                     << "Master cell " << cellI
@@ -183,7 +183,7 @@ void Foam::cellMapper::calcAddressing() const
 
         forAll (cm, cellI)
         {
-            if (cm[cellI] > -1 && addr[cellI].size() == 0)
+            if (cm[cellI] > -1 && addr[cellI].empty())
             {
                 // Mapped from a single cell
                 addr[cellI] = labelList(1, cm[cellI]);
@@ -200,7 +200,7 @@ void Foam::cellMapper::calcAddressing() const
 
         forAll (addr, cellI)
         {
-            if (addr[cellI].size() == 0)
+            if (addr[cellI].empty())
             {
                 // Mapped from a dummy cell
                 addr[cellI] = labelList(1, 0);
@@ -242,10 +242,10 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
     // Check for possibility of direct mapping
     if
     (
-        mpm_.cellsFromPointsMap().size() == 0
-     && mpm_.cellsFromEdgesMap().size() == 0
-     && mpm_.cellsFromFacesMap().size() == 0
-     && mpm_.cellsFromCellsMap().size() == 0
+        mpm_.cellsFromPointsMap().empty()
+     && mpm_.cellsFromEdgesMap().empty()
+     && mpm_.cellsFromFacesMap().empty()
+     && mpm_.cellsFromCellsMap().empty()
     )
     {
         direct_ = true;
@@ -256,7 +256,7 @@ Foam::cellMapper::cellMapper(const mapPolyMesh& mpm)
     }
 
     // Check for inserted cells
-    if (direct_ && (mpm_.cellMap().size() == 0 || min(mpm_.cellMap()) > -1))
+    if (direct_ && (mpm_.cellMap().empty() || min(mpm_.cellMap()) > -1))
     {
         insertedCells_ = false;
     }
@@ -412,7 +412,7 @@ const Foam::labelList& Foam::cellMapper::insertedObjectLabels() const
 
     return *insertedCellLabelsPtr_;
 }
-        
+
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 0196a92f62..d9c54126c2 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -96,7 +96,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = ffp[ffpI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -118,7 +118,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = ffe[ffeI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -140,7 +140,7 @@ void Foam::faceMapper::calcAddressing() const
 
             label faceI = fff[fffI].index();
 
-            if (addr[faceI].size() > 0)
+            if (addr[faceI].size())
             {
                 FatalErrorIn("void faceMapper::calcAddressing() const")
                     << "Master face " << faceI
@@ -160,7 +160,7 @@ void Foam::faceMapper::calcAddressing() const
 
         forAll (fm, faceI)
         {
-            if (fm[faceI] > -1 && addr[faceI].size() == 0)
+            if (fm[faceI] > -1 && addr[faceI].empty())
             {
                 // Mapped from a single face
                 addr[faceI] = labelList(1, fm[faceI]);
@@ -178,7 +178,7 @@ void Foam::faceMapper::calcAddressing() const
 
         forAll (addr, faceI)
         {
-            if (addr[faceI].size() == 0)
+            if (addr[faceI].empty())
             {
                 // Mapped from a dummy face
                 addr[faceI] = labelList(1, 0);
@@ -220,9 +220,9 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
     // Check for possibility of direct mapping
     if
     (
-        mpm_.facesFromPointsMap().size() == 0
-     && mpm_.facesFromEdgesMap().size() == 0
-     && mpm_.facesFromFacesMap().size() == 0
+        mpm_.facesFromPointsMap().empty() 
+     && mpm_.facesFromEdgesMap().empty()
+     && mpm_.facesFromFacesMap().empty()
     )
     {
         direct_ = true;
@@ -233,7 +233,7 @@ Foam::faceMapper::faceMapper(const mapPolyMesh& mpm)
     }
 
     // Check for inserted faces
-    if (direct_ && (mpm_.faceMap().size() == 0 || min(mpm_.faceMap()) > -1))
+    if (direct_ && (mpm_.faceMap().empty() || min(mpm_.faceMap()) > -1))
     {
         insertedFaces_ = false;
     }
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
index 429b75b983..5dac2ebe9c 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C
@@ -48,12 +48,12 @@ Foam::List<Foam::labelPair> Foam::mapDistribute::schedule
         {
             if (procI != Pstream::myProcNo())
             {
-                if (subMap[procI].size() > 0)
+                if (subMap[procI].size())
                 {
                     // I need to send to procI
                     commsSet.insert(labelPair(Pstream::myProcNo(), procI));
                 }
-                if (constructMap[procI].size() > 0)
+                if (constructMap[procI].size())
                 {
                     // I need to receive from procI
                     commsSet.insert(labelPair(procI, Pstream::myProcNo()));
@@ -288,7 +288,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed)
         {
             const labelList& map = constructMap_[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 boolList& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -315,7 +315,7 @@ void Foam::mapDistribute::compact(const boolList& elemIsUsed)
         {
             const labelList& map = subMap_[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
index 46204b3554..08e12b876e 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C
@@ -50,7 +50,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T> subField(map.size());
                 forAll(map, i)
@@ -86,7 +86,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 IPstream fromNbr(Pstream::blocking, domain);
                 List<T> subField(fromNbr);
@@ -227,7 +227,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T>& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -254,7 +254,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
@@ -303,14 +303,14 @@ void Foam::mapDistribute::distribute
 
         OPstream::waitRequests();
         IPstream::waitRequests();
-        
+
         // Collect neighbour fields
 
         for (label domain = 0; domain < Pstream::nProcs(); domain++)
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 if (recvFields[domain].size() != map.size())
                 {
@@ -372,7 +372,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T> subField(map.size());
                 forAll(map, i)
@@ -409,7 +409,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 IPstream fromNbr(Pstream::blocking, domain);
                 List<T> subField(fromNbr);
@@ -550,7 +550,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = subMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 List<T>& subField = sendFields[domain];
                 subField.setSize(map.size());
@@ -577,7 +577,7 @@ void Foam::mapDistribute::distribute
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 recvFields[domain].setSize(map.size());
                 IPstream::read
@@ -625,14 +625,14 @@ void Foam::mapDistribute::distribute
 
         OPstream::waitRequests();
         IPstream::waitRequests();
-        
+
         // Collect neighbour fields
 
         for (label domain = 0; domain < Pstream::nProcs(); domain++)
         {
             const labelList& map = constructMap[domain];
 
-            if (domain != Pstream::myProcNo() && map.size() > 0)
+            if (domain != Pstream::myProcNo() && map.size())
             {
                 if (recvFields[domain].size() != map.size())
                 {
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 20085cb361..261a952b06 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -251,7 +251,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
             }
         }
 
-        if (pointsToEdge.size() > 0)
+        if (pointsToEdge.size())
         {
             FatalErrorIn("polyBoundaryMesh::neighbourEdges() const")
                 << "Not all boundary edges of patches match up." << nl
@@ -425,7 +425,7 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
         // of all patch names for matches
         labelList patchIDs = findStrings(patchNames[i], allPatchNames);
 
-        if (patchIDs.size() == 0)
+        if (patchIDs.empty())
         {
             WarningIn("polyBoundaryMesh::patchSet(const wordList&)")
                 << "Cannot find any patch names matching " << patchNames[i]
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index 65b9ec6412..a1b10f0d8a 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -814,7 +814,7 @@ void Foam::polyMesh::addPatches
     const bool validBoundary
 )
 {
-    if (boundaryMesh().size() > 0)
+    if (boundaryMesh().size())
     {
         FatalErrorIn
         (
@@ -858,12 +858,7 @@ void Foam::polyMesh::addZones
     const List<cellZone*>& cz
 )
 {
-    if
-    (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-    )
+    if (pointZones().size() || faceZones().size() || cellZones().size())
     {
         FatalErrorIn
         (
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index 1562740a31..690fb1083b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                       Class coupledPolyPatch Declaration
+                      Class coupledPolyPatch Declaration
 \*---------------------------------------------------------------------------*/
 
 class coupledPolyPatch
@@ -256,7 +256,7 @@ public:
             //- Are the cyclic planes parallel
             bool parallel() const
             {
-                return forwardT_.size() == 0;
+                return forwardT_.empty();
             }
 
             //- Return face transformation tensor
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 593a0bb2d8..1e42d48ea3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -86,7 +86,7 @@ Foam::label Foam::cyclicPolyPatch::findMaxArea
 
 void Foam::cyclicPolyPatch::calcTransforms()
 {
-    if (size() > 0)
+    if (size())
     {
         const pointField& points = this->points();
 
@@ -1111,7 +1111,7 @@ bool Foam::cyclicPolyPatch::order
     rotation.setSize(pp.size());
     rotation = 0;
 
-    if (pp.size() == 0)
+    if (pp.empty())
     {
         // No faces, nothing to change.
         return false;
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
index 490981735c..4fcf243dd5 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchAddressing.C
@@ -211,7 +211,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::calcAddressing()
 
             forAll (neiFaces, nfI)
             {
-                if (neiFaces[nfI].size() > 0 && neiFaces[nfI][0] < minNei)
+                if (neiFaces[nfI].size() && neiFaces[nfI][0] < minNei)
                 {
                     nextNei = nfI;
                     minNei = neiFaces[nfI][0];
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
index 70f2241cba..cb6987bd21 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchLocalPointOrder.C
@@ -127,7 +127,7 @@ void PrimitivePatch<Face, FaceList, PointField, PointType>::
                         }
                     }
                 }
-            } while (faceOrder.size() > 0);
+            } while (faceOrder.size());
         }
     }
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
index a1ef18bece..e34b2a2a44 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraCleanup.C
@@ -53,7 +53,7 @@ checkEdges
 
         // boundary edges have one face
         // interior edges have two faces
-        if (myFaces.size() == 0)
+        if (myFaces.empty())
         {
             FatalErrorIn
             (
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
index 1f859b03cc..0d56d9be1e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatchExtra/PrimitivePatchExtraSearch.C
@@ -97,12 +97,12 @@ void Foam::PrimitivePatchExtra<Face, FaceList, PointField, PointType>::markZone
             }
         }
 
-        if (newChangedFaces.size() == 0)
+        if (newChangedFaces.empty())
         {
             break;
         }
 
-        // New dynamicList: can leave dynamicList unshrunk
+        // transfer from dynamic to normal list
         changedFaces.transfer(newChangedFaces);
     }
 }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 5795efc28b..8938faf69b 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -760,7 +760,7 @@ bool primitiveMesh::checkPoints
 
     forAll (pf, pointI)
     {
-        if (pf[pointI].size() == 0)
+        if (pf[pointI].empty())
         {
             if (setPtr)
             {
@@ -776,7 +776,7 @@ bool primitiveMesh::checkPoints
     {
         const labelList& pc = pointCells(pointI);
 
-        if (pc.size() == 0)
+        if (pc.empty())
         {
             if (setPtr)
             {
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
index c5ab576e69..080ee1cd75 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
@@ -130,7 +130,7 @@ void patchZones::markZone(label faceI)
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -144,7 +144,7 @@ void patchZones::markZone(label faceI)
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
index e5fedccabd..f49c8beca8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.C
@@ -29,22 +29,14 @@ Description
 #include "walkPatch.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(walkPatch, 0);
-
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+defineTypeNameAndDebug(Foam::walkPatch, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // Get other face using v0, v1 (in localFaces numbering). Or -1.
-label walkPatch::getNeighbour
+Foam::label Foam::walkPatch::getNeighbour
 (
     const label faceI,
     const label fp,
@@ -104,19 +96,11 @@ label walkPatch::getNeighbour
 
     const labelList& eFaces = pp_.edgeFaces()[nbrEdgeI];
 
-    if (eFaces.size() > 2 || eFaces.size() <= 0)
-    {
-        FatalErrorIn("getNeighbour")
-            << "Illegal surface on patch. Face " << faceI
-            << " at vertices " << v0 << ',' << v1 << " has more than 2"
-            << " or less than 1 neighbours" << abort(FatalError);
-        return -1;
-    }
-    else if (eFaces.size() == 1)
+    if (eFaces.size() == 1)
     {
         return -1;
     }
-    else
+    else if (eFaces.size() == 2)
     {
         label nbrFaceI = eFaces[0];
 
@@ -127,12 +111,21 @@ label walkPatch::getNeighbour
 
         return nbrFaceI;
     }
+    else
+    {
+        FatalErrorIn("getNeighbour")
+            << "Illegal surface on patch. Face " << faceI
+            << " at vertices " << v0 << ',' << v1
+            << " has fewer than 1 or more than 2 neighbours"
+            << abort(FatalError);
+        return -1;
+    }
 }
 
 
 // Gets labels of changed faces and enterVertices on faces.
 // Returns labels of faces changed and enterVertices on them.
-void walkPatch::faceToFace
+void Foam::walkPatch::faceToFace
 (
     const labelList& changedFaces,
     const labelList& enterVerts,
@@ -149,7 +142,7 @@ void walkPatch::faceToFace
     {
         label faceI = changedFaces[i];
         label enterVertI = enterVerts[i];
- 
+
         if (!visited_[faceI])
         {
             // Do this face
@@ -225,7 +218,7 @@ Foam::walkPatch::walkPatch
     // Corresponding list of entry vertices
     labelList enterVerts(1, enterVertI);
 
-    while(1)
+    while (true)
     {
         labelList nbrFaces;
         labelList nbrEnterVerts;
@@ -240,7 +233,7 @@ Foam::walkPatch::walkPatch
         );
 
 
-        if (nbrFaces.size() == 0)
+        if (nbrFaces.empty())
         {
             break;
         }
@@ -254,8 +247,4 @@ Foam::walkPatch::walkPatch
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index f21c7471e0..3538d94239 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -26,8 +26,7 @@ Primitive
     bool
 
 Description
-    C++ 4.0 supports a builtin type bool but older compilers do not.
-    This is a simple typedef to emulate the standard bool type.
+    System bool
 
 SourceFiles
     boolIO.C
diff --git a/src/OpenFOAM/primitives/bools/bool/boolIO.C b/src/OpenFOAM/primitives/bools/bool/boolIO.C
index 298624b271..b5636b5890 100644
--- a/src/OpenFOAM/primitives/bools/bool/boolIO.C
+++ b/src/OpenFOAM/primitives/bools/bool/boolIO.C
@@ -23,10 +23,9 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Reads an bool from an input stream, for a given version
-    number and File format. If an ascii File is being read,
-    then the line numbers are counted and an erroneous read
-    ised.
+    Reads an bool from an input stream, for a given version number and file
+    format. If an ASCII file is being read, then the line numbers are counted
+    and an erroneous read is reported.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/primitives/nil/nil.H b/src/OpenFOAM/primitives/nil/nil.H
index c6fd97eaaf..320438ddc5 100644
--- a/src/OpenFOAM/primitives/nil/nil.H
+++ b/src/OpenFOAM/primitives/nil/nil.H
@@ -26,7 +26,10 @@ Class
     Foam::nil
 
 Description
-    A class without any storage. Used, for example, in HashSet.
+    A zero-sized class without any storage. Used, for example, in HashSet.
+
+Note
+    A zero-sized class actually does still require at least 1 byte storage.
 
 \*---------------------------------------------------------------------------*/
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 8545d03a95..6a7e2056c6 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -238,9 +238,9 @@ void Foam::fileName::operator=(const char* str)
 
 Foam::fileName Foam::operator/(const string& a, const string& b)
 {
-    if (a.size() > 0)       // First string non-null
+    if (a.size())           // First string non-null
     {
-        if (b.size() > 0)   // Second string non-null
+        if (b.size())       // Second string non-null
         {
             return fileName(a + '/' + b);
         }
@@ -251,7 +251,7 @@ Foam::fileName Foam::operator/(const string& a, const string& b)
     }
     else                    // First string null
     {
-        if (b.size() > 0)   // Second string non-null
+        if (b.size())       // Second string non-null
         {
             return b;
         }
diff --git a/src/OpenFOAM/primitives/strings/word/wordI.H b/src/OpenFOAM/primitives/strings/word/wordI.H
index 24942c70c8..f84b99be43 100644
--- a/src/OpenFOAM/primitives/strings/word/wordI.H
+++ b/src/OpenFOAM/primitives/strings/word/wordI.H
@@ -162,17 +162,17 @@ inline void Foam::word::operator=(const char* q)
 
 inline Foam::word Foam::operator&(const word& a, const word& b)
 {
-    if (!b.size())
-    {
-        return a;
-    }
-    else
+    if (b.size())
     {
         string ub = b;
         ub.string::operator[](0) = char(toupper(ub.string::operator[](0)));
 
         return a + ub;
     }
+    else
+    {
+        return a;
+    }
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/strings/word/wordIO.C b/src/OpenFOAM/primitives/strings/word/wordIO.C
index 37cbaa79cf..093a282846 100644
--- a/src/OpenFOAM/primitives/strings/word/wordIO.C
+++ b/src/OpenFOAM/primitives/strings/word/wordIO.C
@@ -61,7 +61,7 @@ Foam::Istream& Foam::operator>>(Istream& is, word& w)
         string::stripInvalid<word>(w);
 
         // flag empty strings and bad chars as an error
-        if (!w.size() || w.size() != t.stringToken().size())
+        if (w.empty() || w.size() != t.stringToken().size())
         {
             is.setBad();
             FatalIOErrorIn("operator>>(Istream&, word&)", is)
diff --git a/src/Pstream/gamma/OPwrite.C b/src/Pstream/gamma/OPwrite.C
index fedc525d65..00eaa13f81 100644
--- a/src/Pstream/gamma/OPwrite.C
+++ b/src/Pstream/gamma/OPwrite.C
@@ -98,7 +98,7 @@ bool OPstream::write
             << Foam::abort(FatalError);
     }
 
-    if (maxSendSize.size() == 0)
+    if (maxSendSize.empty())
     {
         // Intialize maxSendSize to the initial size of the receive buffers.
         maxSendSize.setSize(Pstream::nProcs());
diff --git a/src/Pstream/mpi/IPread.C b/src/Pstream/mpi/IPread.C
index ad3c915e7e..2b6953765a 100644
--- a/src/Pstream/mpi/IPread.C
+++ b/src/Pstream/mpi/IPread.C
@@ -191,7 +191,7 @@ Foam::label Foam::IPstream::read
 
 void Foam::IPstream::waitRequests()
 {
-    if (IPstream_outstandingRequests_.size() > 0)
+    if (IPstream_outstandingRequests_.size())
     {
         if
         (
diff --git a/src/Pstream/mpi/OPwrite.C b/src/Pstream/mpi/OPwrite.C
index 9b2ecda890..230a366ebd 100644
--- a/src/Pstream/mpi/OPwrite.C
+++ b/src/Pstream/mpi/OPwrite.C
@@ -129,7 +129,7 @@ bool Foam::OPstream::write
 
 void Foam::OPstream::waitRequests()
 {
-    if (OPstream_outstandingRequests_.size() > 0)
+    if (OPstream_outstandingRequests_.size())
     {
         if
         (
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 300ed06c5e..7a3152b494 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -351,7 +351,7 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
     ////  in when snapping)
     //
     //labelList namedSurfaces(surfaces().getNamedSurfaces());
-    //if (namedSurfaces.size() > 0)
+    //if (namedSurfaces.size())
     //{
     //    Info<< nl
     //        << "Introducing cyclics for faceZones" << nl
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index c8e9baafe5..b384902710 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
@@ -2420,7 +2420,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
     {
         const labelList& layer = layerFaces[oldPatchFaceI];
 
-        if (layer.size() > 0)
+        if (layer.size())
         {
             for (label i = 1; i < layer.size()-1; i++)
             {
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index 93fa342507..f602376461 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
@@ -143,7 +143,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
 
     label iter = 0;
 
-    if (featureMeshes.size() > 0 && maxIter > 0)
+    if (featureMeshes.size() && maxIter > 0)
     {
         for (; iter < maxIter; iter++)
         {
@@ -541,7 +541,7 @@ void Foam::autoRefineDriver::zonify
     // into that surface's faceZone. All cells inside faceZone get given the
     // same cellZone.
 
-    if (meshRefiner_.surfaces().getNamedSurfaces().size() > 0)
+    if (meshRefiner_.surfaces().getNamedSurfaces().size())
     {
         Info<< nl
             << "Introducing zones for interfaces" << nl
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
index adcd9c5aeb..a4cd0a504d 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C
@@ -73,7 +73,7 @@ void Foam::autoSnapDriver::getZonedSurfaces
 
     forAll(faceZoneNames, surfI)
     {
-        if (faceZoneNames[surfI].size() > 0)
+        if (faceZoneNames[surfI].size())
         {
             zonedSurfaces[zonedI++] = surfI;
         }
@@ -103,7 +103,7 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
 
     forAll(faceZoneNames, surfI)
     {
-        if (faceZoneNames[surfI].size() > 0)
+        if (faceZoneNames[surfI].size())
         {
             // Get zone
             label zoneI = fZones.findZoneID(faceZoneNames[surfI]);
@@ -718,7 +718,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::createZoneBaffles
     autoPtr<mapPolyMesh> map;
 
     // No need to sync; all processors will have all same zonedSurfaces.
-    if (zonedSurfaces.size() > 0)
+    if (zonedSurfaces.size())
     {
         fvMesh& mesh = meshRefiner_.mesh();
 
@@ -806,7 +806,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
 
     // No need to sync; all processors will have all same zonedSurfaces.
     label nBaffles = returnReduce(baffles.size(), sumOp<label>());
-    if (zonedSurfaces.size() > 0 && nBaffles > 0)
+    if (zonedSurfaces.size() && nBaffles > 0)
     {
         // Merge any baffles
         Info<< "Converting " << nBaffles << " baffles back into zoned faces ..."
@@ -1122,7 +1122,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 
             forAll(hitInfo, i)
             {
-                label pointI = zonePointIndices[i]; 
+                label pointI = zonePointIndices[i];
 
                 if (hitInfo[i].hit())
                 {
@@ -1391,7 +1391,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
             forAll(fZone, i)
             {
                 isZonedFace.set(fZone[i], 1);
-            }  
+            }
         }
     }
 
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index c80e6a4881..4b10b84763 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -1060,7 +1060,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::meshRefinement::balance
 
                 forAll(fzNames, surfI)
                 {
-                    if (fzNames[surfI].size() > 0)
+                    if (fzNames[surfI].size())
                     {
                         // Get zone
                         label zoneI = fZones.findZoneID(fzNames[surfI]);
@@ -1713,7 +1713,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::splitMeshRegions
 
     labelList exposedFaces(cellRemover.getExposedFaces(cellsToRemove));
 
-    if (exposedFaces.size() > 0)
+    if (exposedFaces.size())
     {
         FatalErrorIn
         (
@@ -2148,7 +2148,7 @@ void Foam::meshRefinement::write
     {
         dumpRefinementLevel();
     }
-    if (flag&OBJINTERSECTIONS && prefix.size()>0)
+    if (flag & OBJINTERSECTIONS && prefix.size())
     {
         dumpIntersections(prefix);
     }
diff --git a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
index 79d698bef6..2d7ca7314b 100644
--- a/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -241,7 +241,7 @@ void Foam::meshRefinement::getBafflePatches
     label baffleI = 0;
     forAll(cellZoneNames, surfI)
     {
-        if (cellZoneNames[surfI].size() > 0)
+        if (cellZoneNames[surfI].size())
         {
             if (debug)
             {
@@ -1385,7 +1385,7 @@ void Foam::meshRefinement::baffleAndSplitMesh
             faceSet problemTopo(mesh_, "problemFacesTopo", 100);
 
             const labelList facePatchTopo
-            (    
+            (
                 markFacesOnProblemCells
                 (
                     removeEdgeConnectedCells,
@@ -1605,7 +1605,7 @@ Foam::autoPtr<Foam::mapPolyMesh>  Foam::meshRefinement::splitMesh
 
     // Patch for exposed faces for lack of anything sensible.
     label defaultPatch = 0;
-    if (globalToPatch.size() > 0)
+    if (globalToPatch.size())
     {
         defaultPatch = globalToPatch[0];
     }
@@ -2155,7 +2155,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::meshRefinement::zonify
     // Set using geometric test
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
-    if (closedNamedSurfaces.size() > 0)
+    if (closedNamedSurfaces.size())
     {
         findCellZoneGeometric
         (
diff --git a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
index bf728dfe48..6277740b9a 100644
--- a/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/autoMesh/autoHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -416,12 +416,12 @@ Foam::refinementSurfaces::refinementSurfaces
 // Get indices of unnamed surfaces (surfaces without faceZoneName)
 Foam::labelList Foam::refinementSurfaces::getUnnamedSurfaces() const
 {
-   labelList anonymousSurfaces(faceZoneNames_.size());
+    labelList anonymousSurfaces(faceZoneNames_.size());
 
     label i = 0;
     forAll(faceZoneNames_, surfI)
     {
-        if (faceZoneNames_[surfI].size() == 0)
+        if (faceZoneNames_[surfI].empty())
         {
             anonymousSurfaces[i++] = surfI;
         }
@@ -440,7 +440,7 @@ Foam::labelList Foam::refinementSurfaces::getNamedSurfaces() const
     label namedI = 0;
     forAll(faceZoneNames_, surfI)
     {
-        if (faceZoneNames_[surfI].size() > 0)
+        if (faceZoneNames_[surfI].size())
         {
             namedSurfaces[namedI++] = surfI;
         }
@@ -574,7 +574,7 @@ void Foam::refinementSurfaces::findHigherIntersection
     surfaceLevel.setSize(start.size());
     surfaceLevel = -1;
 
-    if (surfaces_.size() == 0)
+    if (surfaces_.empty())
     {
         return;
     }
@@ -614,14 +614,14 @@ void Foam::refinementSurfaces::findHigherIntersection
             if (hitInfo[hitI].hit())
             {
                 // Check if minLevelField for this surface.
-                if (minLevelField.size() > 0)
+                if (minLevelField.size())
                 {
                     minLocalLevel = minLevelField[hitI];
                 }
                 else
                 {
                     // Use the min level for the surface instead. Assume
-                    // single region 0. 
+                    // single region 0.
                     minLocalLevel = minLevel(surfI, 0);
                 }
             }
@@ -673,7 +673,7 @@ void Foam::refinementSurfaces::findAllHigherIntersections
     surfaceLevel.setSize(start.size());
     surfaceNormal.setSize(start.size());
 
-    if (surfaces_.size() == 0)
+    if (surfaces_.empty())
     {
         return;
     }
@@ -969,7 +969,7 @@ void Foam::refinementSurfaces::findNearestRegion
 
         List<pointIndexHit> localHits
         (
-            IndirectList<pointIndexHit> 
+            IndirectList<pointIndexHit>
             (
                 hitInfo,
                 localIndices
diff --git a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
index 492ceaa58e..9c06ccddea 100644
--- a/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/autoMesh/autoHexMesh/shellSurfaces/shellSurfaces.C
@@ -170,7 +170,7 @@ void Foam::shellSurfaces::orient()
         {
             const triSurfaceMesh& shell = refCast<const triSurfaceMesh>(s);
 
-            if (shell.triSurface::size() > 0)
+            if (shell.triSurface::size())
             {
                 const pointField& points = shell.points();
 
diff --git a/src/conversion/meshTables/boundaryRegion.C b/src/conversion/meshTables/boundaryRegion.C
index 73b9abcd36..b5c278887f 100644
--- a/src/conversion/meshTables/boundaryRegion.C
+++ b/src/conversion/meshTables/boundaryRegion.C
@@ -114,7 +114,7 @@ Foam::Map<Foam::word> Foam::boundaryRegion::names
         {
             lookup.insert(iter.key(), lookupName);
         }
-    }    
+    }
 
     return lookup;
 }
@@ -139,7 +139,7 @@ Foam::Map<Foam::word> Foam::boundaryRegion::boundaryTypes() const
 
 Foam::label Foam::boundaryRegion::findIndex(const word& name) const
 {
-    if (!name.size())
+    if (name.empty())
     {
         return -1;
     }
@@ -254,7 +254,7 @@ void Foam::boundaryRegion::operator=(const Map<dictionary>& rhs)
 
 void Foam::boundaryRegion::rename(const dictionary& mapDict)
 {
-    if (!mapDict.size())
+    if (mapDict.empty())
     {
         return;
     }
diff --git a/src/conversion/meshTables/cellTable.C b/src/conversion/meshTables/cellTable.C
index 6b3789eb02..5239e6bc12 100644
--- a/src/conversion/meshTables/cellTable.C
+++ b/src/conversion/meshTables/cellTable.C
@@ -208,7 +208,7 @@ Foam::word Foam::cellTable::name(const label& id) const
 
 Foam::label Foam::cellTable::findIndex(const word& name) const
 {
-    if (!name.size())
+    if (name.empty())
     {
         return -1;
     }
@@ -466,7 +466,7 @@ void Foam::cellTable::addCellZones
     forAll(zoneCells, zoneI)
     {
         zoneCells[zoneI].shrink();
-        if (zoneCells[zoneI].size() > 0)
+        if (zoneCells[zoneI].size())
         {
             zoneUsed[nZone++] = zoneI;
         }
@@ -509,7 +509,7 @@ void Foam::cellTable::addCellZones
 
 void Foam::cellTable::combine(const dictionary& mapDict, labelList& tableIds)
 {
-    if (!mapDict.size())
+    if (mapDict.empty())
     {
         return;
     }
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 6053314948..5d4bc79205 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -92,7 +92,7 @@ void Foam::meshWriters::STARCD::getCellTable()
         {
             cellTableId_.transfer(ioList);
 
-            if (!cellTable_.size())
+            if (cellTable_.empty())
             {
                 Info<< "no cellTable information available" << endl;
             }
@@ -116,7 +116,7 @@ void Foam::meshWriters::STARCD::getCellTable()
 
     if (useCellZones)
     {
-        if (!cellTable_.size())
+        if (cellTable_.empty())
         {
             Info<< "created cellTable from cellZones" << endl;
             cellTable_ = mesh_;
@@ -500,7 +500,7 @@ bool Foam::meshWriters::STARCD::write(const fileName& meshName) const
 {
     fileName baseName(meshName);
 
-    if (!baseName.size())
+    if (baseName.empty())
     {
         baseName = meshWriter::defaultMeshName;
 
@@ -535,7 +535,7 @@ bool Foam::meshWriters::STARCD::writeSurface
 {
     fileName baseName(meshName);
 
-    if (!baseName.size())
+    if (baseName.empty())
     {
         baseName = meshWriter::defaultSurfaceName;
 
diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C
index 7d12bab37f..0db23c7ed6 100644
--- a/src/conversion/polyDualMesh/polyDualMesh.C
+++ b/src/conversion/polyDualMesh/polyDualMesh.C
@@ -758,7 +758,7 @@ void Foam::polyDualMesh::calcDual
 
         allBoundary.checkPointManifold(true, &nonManifoldPoints);
 
-        if (nonManifoldPoints.size() > 0)
+        if (nonManifoldPoints.size())
         {
             nonManifoldPoints.write();
 
@@ -1151,7 +1151,7 @@ void Foam::polyDualMesh::calcDual
         dynDualOwner.shrink();
         dynDualNeighbour.shrink();
         dynDualRegion.shrink();
-    
+
         OFstream str("dualInternalFaces.obj");
         Pout<< "polyDualMesh::calcDual : dumping internal faces to "
             << str.name() << endl;
@@ -1163,7 +1163,7 @@ void Foam::polyDualMesh::calcDual
         forAll(dynDualFaces, dualFaceI)
         {
             const face& f = dynDualFaces[dualFaceI];
-    
+
             str<< 'f';
             forAll(f, fp)
             {
@@ -1229,7 +1229,7 @@ void Foam::polyDualMesh::calcDual
         forAll(dualFaces, dualFaceI)
         {
             const face& f = dualFaces[dualFaceI];
-    
+
             str<< 'f';
             forAll(f, fp)
             {
diff --git a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C b/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
index 722deab57c..882123c526 100644
--- a/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
+++ b/src/decompositionAgglomeration/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
@@ -236,14 +236,18 @@ void Foam::hierarchGeomDecomp::sortComponent
 
     scalar minCoord = returnReduce
     (
-        (sortedCoord.size() > 0 ? sortedCoord[0] : GREAT),
+        (
+            sortedCoord.size()
+          ? sortedCoord[0]
+          : GREAT
+        ),
         minOp<scalar>()
     );
 
     scalar maxCoord = returnReduce
     (
         (
-            sortedCoord.size() > 0
+            sortedCoord.size()
           ? sortedCoord[sortedCoord.size()-1]
           : -GREAT
         ),
@@ -251,7 +255,7 @@ void Foam::hierarchGeomDecomp::sortComponent
     );
 
     if (debug)
-    {   
+    {
         Pout<< "sortComponent : minCoord:" << minCoord
             << " maxCoord:" << maxCoord << endl;
     }
@@ -274,7 +278,7 @@ void Foam::hierarchGeomDecomp::sortComponent
 
         // Value at right of bin (leftIndex+localSize-1)
         scalar rightCoord = -GREAT;
-        
+
         if (bin == n_[compI]-1)
         {
             // Last bin. Copy all.
diff --git a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C b/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
index 5d368642b6..b4a643562f 100644
--- a/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
+++ b/src/decompositionAgglomeration/decompositionMethods/metisDecomp/metisDecomp.C
@@ -220,12 +220,12 @@ Foam::label Foam::metisDecomp::decompose
     int* vwgtPtr = NULL;
     int* adjwgtPtr = NULL;
 
-    if (cellWeights.size() > 0)
+    if (cellWeights.size())
     {
         vwgtPtr = cellWeights.begin();
         wgtFlag += 2;       // Weights on vertices
     }
-    if (faceWeights.size() > 0)
+    if (faceWeights.size())
     {
         adjwgtPtr = faceWeights.begin();
         wgtFlag += 1;       // Weights on edges
diff --git a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C b/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
index 73c8160af7..c6c6e061e9 100644
--- a/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
+++ b/src/decompositionAgglomeration/parMetisDecomp/parMetisDecomp.C
@@ -188,7 +188,7 @@ Foam::label Foam::parMetisDecomp::decompose
             << SubField<floatScalar>(xyz, nDims*nCells, nDims*startCell)
             <<
             (
-                (cellWeights.size() > 0)
+                cellWeights.size()
               ? static_cast<const Field<int>&>
                 (
                     Field<int>::subField(cellWeights, nCells, startCell)
@@ -197,7 +197,7 @@ Foam::label Foam::parMetisDecomp::decompose
             )
             <<
             (
-                (faceWeights.size() > 0)
+                faceWeights.size()
               ? static_cast<const Field<int>&>
                 (
                     Field<int>::subField(faceWeights, nFaces, startFace)
@@ -206,11 +206,11 @@ Foam::label Foam::parMetisDecomp::decompose
             );
 
         // Remove data that has been sent
-        if (faceWeights.size() > 0)
+        if (faceWeights.size())
         {
             faceWeights.setSize(faceWeights.size()-nFaces);
         }
-        if (cellWeights.size() > 0)
+        if (cellWeights.size())
         {
             cellWeights.setSize(cellWeights.size()-nCells);
         }
@@ -255,12 +255,12 @@ Foam::label Foam::parMetisDecomp::decompose
     int* vwgtPtr = NULL;
     int* adjwgtPtr = NULL;
 
-    if (cellWeights.size() > 0)
+    if (cellWeights.size())
     {
         vwgtPtr = cellWeights.begin();
         wgtFlag += 2;       // Weights on vertices
     }
-    if (faceWeights.size() > 0)
+    if (faceWeights.size())
     {
         adjwgtPtr = faceWeights.begin();
         wgtFlag += 1;       // Weights on edges
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 99fc1b78fd..2cb639cb63 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -66,7 +66,7 @@ void dynamicRefineFvMesh::calculateProtectedCells
     PackedList<1>& unrefineableCell
 ) const
 {
-    if (protectedCell_.size() == 0)
+    if (protectedCell_.empty())
     {
         unrefineableCell.clear();
         return;
@@ -375,7 +375,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
                 }
             }
         }
-    }            
+    }
 
 
 
@@ -383,7 +383,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
     meshCutter_.updateMesh(map);
 
     // Update numbering of protectedCell_
-    if (protectedCell_.size() > 0)
+    if (protectedCell_.size())
     {
         PackedList<1> newProtectedCell(nCells(), 0);
 
@@ -536,7 +536,7 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
     meshCutter_.updateMesh(map);
 
     // Update numbering of protectedCell_
-    if (protectedCell_.size() > 0)
+    if (protectedCell_.size())
     {
         PackedList<1> newProtectedCell(nCells(), 0);
 
@@ -703,7 +703,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
                 cellLevel[cellI] < maxRefinement
              && candidateCell.get(cellI) == 1
              && (
-                    unrefineableCell.size() == 0
+                    unrefineableCell.empty()
                  || unrefineableCell.get(cellI) == 0
                 )
             )
@@ -724,7 +724,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
                     cellLevel[cellI] == level
                  && candidateCell.get(cellI) == 1
                  && (
-                        unrefineableCell.size() == 0
+                        unrefineableCell.empty()
                      || unrefineableCell.get(cellI) == 0
                     )
                 )
diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index 777407492a..43305938cb 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -83,8 +83,8 @@ void Foam::attachDetach::checkDefinition()
     // Check the sizes and set up state
     if
     (
-        mesh.boundaryMesh()[masterPatchID_.index()].size() == 0
-     && mesh.boundaryMesh()[slavePatchID_.index()].size() == 0
+        mesh.boundaryMesh()[masterPatchID_.index()].empty()
+     && mesh.boundaryMesh()[slavePatchID_.index()].empty()
     )
     {
         // Boundary is attached
@@ -96,7 +96,7 @@ void Foam::attachDetach::checkDefinition()
         state_ = ATTACHED;
 
         // Check if there are faces in the master zone
-        if (mesh.faceZones()[faceZoneID_.index()].size() == 0)
+        if (mesh.faceZones()[faceZoneID_.index()].empty())
         {
             FatalErrorIn
             (
@@ -121,7 +121,7 @@ void Foam::attachDetach::checkDefinition()
                 }
             }
 
-            if (bouFacesInZone.size() > 0)
+            if (bouFacesInZone.size())
             {
                 FatalErrorIn
                 (
@@ -196,7 +196,7 @@ void Foam::attachDetach::checkDefinition()
                 }
             }
 
-            if (zoneProblemFaces.size() > 0)
+            if (zoneProblemFaces.size())
             {
                 FatalErrorIn
                 (
@@ -222,7 +222,7 @@ void Foam::attachDetach::checkDefinition()
     if
     (
         !triggersOK
-     || (triggerTimes_.size() < 1 && !manualTrigger())
+     || (triggerTimes_.empty() && !manualTrigger())
     )
     {
         FatalErrorIn
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 28396e2918..494cda9295 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -37,10 +37,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(boundaryMesh, 0);
-}
+defineTypeNameAndDebug(Foam::boundaryMesh, 0);
 
 // Normal along which to divide faces into categories (used in getNearest)
 const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
@@ -394,14 +391,13 @@ void Foam::boundaryMesh::markZone
 
     while(1)
     {
-        changedEdges =
-            faceToEdge
-            (
-                borderEdge,
-                currentZone,
-                changedFaces,
-                edgeZone
-            );
+        changedEdges = faceToEdge
+        (
+            borderEdge,
+            currentZone,
+            changedFaces,
+            edgeZone
+        );
 
         if (debug)
         {
@@ -410,7 +406,7 @@ void Foam::boundaryMesh::markZone
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -424,7 +420,7 @@ void Foam::boundaryMesh::markZone
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedFaces.empty())
         {
             break;
         }
@@ -604,7 +600,7 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
 {
     triSurface surf(fName);
 
-    if (surf.size() <= 0)
+    if (surf.empty())
     {
         return;
     }
@@ -1239,7 +1235,7 @@ void Foam::boundaryMesh::patchify
     // Pass2:
     // Change patch type for face
 
-    if (newPatchPtrList.size() > 0)
+    if (newPatchPtrList.size())
     {
         List<DynamicList<label> > patchFaces(nNewPatches);
 
@@ -1597,7 +1593,7 @@ void Foam::boundaryMesh::deletePatch(const word& patchName)
             << abort(FatalError);
     }
 
-    if (patches_[delPatchI].size() != 0)
+    if (patches_[delPatchI].size())
     {
         FatalErrorIn("boundaryMesh::deletePatch(const word&")
             << "Trying to delete non-empty patch " << patchName
@@ -1715,7 +1711,7 @@ void Foam::boundaryMesh::changeFaces
     {
         label patchID = patchIDs[faceI];
 
-        if ((patchID < 0) || (patchID >= patches_.size()))
+        if (patchID < 0 || patchID >= patches_.size())
         {
             FatalErrorIn("boundaryMesh::changeFaces(const labelList&)")
                 << "PatchID " << patchID << " out of range"
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 31138b5e68..38e040506f 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -196,7 +196,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
             << endl;
     }
 
-    if (mesh.pointZones().size() > 0)
+    if (mesh.pointZones().size())
     {
         Pout<< "PointZones:" << endl;
         forAll(mesh.pointZones(), zoneI)
@@ -207,7 +207,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
                 << endl;
         }
     }
-    if (mesh.faceZones().size() > 0)
+    if (mesh.faceZones().size())
     {
         Pout<< "FaceZones:" << endl;
         forAll(mesh.faceZones(), zoneI)
@@ -218,7 +218,7 @@ void Foam::fvMeshDistribute::printMeshInfo(const fvMesh& mesh)
                 << endl;
         }
     }
-    if (mesh.cellZones().size() > 0)
+    if (mesh.cellZones().size())
     {
         Pout<< "CellZones:" << endl;
         forAll(mesh.cellZones(), zoneI)
@@ -392,7 +392,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatch()
         const_cast<polyBoundaryMesh&>(mesh_.boundaryMesh());
     fvBoundaryMesh& fvPatches = const_cast<fvBoundaryMesh&>(mesh_.boundary());
 
-    if (polyPatches.size() == 0)
+    if (polyPatches.empty())
     {
         FatalErrorIn("fvMeshDistribute::deleteTrailingPatch(fvMesh&)")
             << "No patches in mesh"
@@ -410,7 +410,7 @@ void Foam::fvMeshDistribute::deleteTrailingPatch()
             << " : " << polyPatches[sz-1].name() << " size:" << nFaces << endl;
     }
 
-    if (nFaces != 0)
+    if (nFaces)
     {
         FatalErrorIn("fvMeshDistribute::deleteTrailingPatch()")
             << "There are still " << nFaces << " faces in patch to be deleted "
@@ -2035,7 +2035,7 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
 
             forAll(constructPatchMap, procI)
             {
-                if (procI != sendProc && constructPatchMap[procI].size() > 0)
+                if (procI != sendProc && constructPatchMap[procI].size())
                 {
                     // Processor already in mesh (either myProcNo or received)
                     inplaceRenumber(oldCellMap, constructCellMap[procI]);
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 27a54a0556..934484a797 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -80,13 +80,13 @@ void Foam::layerAdditionRemoval::checkDefinition()
             << abort(FatalError);
     }
 
-    if (topoChanger().mesh().faceZones()[faceZoneID_.index()].size() == 0)
+    if (topoChanger().mesh().faceZones()[faceZoneID_.index()].empty())
     {
         FatalErrorIn
         (
             "void Foam::layerAdditionRemoval::checkDefinition()"
-        )   << "Face extrusion zone contains no faces.  Please check your "
-            << "mesh definition."
+        )   << "Face extrusion zone contains no faces. "
+            << " Please check your mesh definition."
             << abort(FatalError);
     }
 
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 45b2da5168..7e0e1fbb8d 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -37,12 +37,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(cellCuts, 0);
-
-}
+defineTypeNameAndDebug(Foam::cellCuts, 0);
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
@@ -2012,7 +2007,7 @@ void Foam::cellCuts::setFromCellLoops()
     {
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             // Storage for cross-face cuts
             Map<edge> faceSplitCuts(loop.size());
@@ -2203,7 +2198,7 @@ void Foam::cellCuts::setFromCellLoops
 
         const labelList& loop = cellLoops[cellLabelI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             const scalarField& loopWeights = cellLoopWeights[cellLabelI];
 
@@ -2296,7 +2291,7 @@ void Foam::cellCuts::setFromCellCutter
         }
     }
 
-    if (debug && invalidCutCells.size() > 0)
+    if (debug && invalidCutCells.size())
     {
         invalidCutCells.shrink();
         invalidCutLoops.shrink();
@@ -2408,7 +2403,7 @@ void Foam::cellCuts::setFromCellCutter
         }
     }
 
-    if (debug && invalidCutCells.size() > 0)
+    if (debug && invalidCutCells.size())
     {
         invalidCutCells.shrink();
         invalidCutLoops.shrink();
@@ -2458,7 +2453,7 @@ void Foam::cellCuts::orientPlanesAndLoops()
     {
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0 && cellAnchorPoints_[cellI].size() == 0)
+        if (loop.size() && cellAnchorPoints_[cellI].empty())
         {
             // Leave anchor points empty if illegal loop.
             calcAnchors
@@ -2477,9 +2472,9 @@ void Foam::cellCuts::orientPlanesAndLoops()
     }
     forAll(cellAnchorPoints_, cellI)
     {
-        if (cellLoops_[cellI].size() > 0)
+        if (cellLoops_[cellI].size())
         {
-            if (cellAnchorPoints_[cellI].size() == 0)
+            if (cellAnchorPoints_[cellI].empty())
             {
                 FatalErrorIn("orientPlanesAndLoops()")
                     << "No anchor points for cut cell " << cellI << endl
@@ -2499,7 +2494,7 @@ void Foam::cellCuts::orientPlanesAndLoops()
 
     forAll(cellLoops_, cellI)
     {
-        if (cellLoops_[cellI].size() > 0)
+        if (cellLoops_[cellI].size())
         {
             nLoops_++;
         }
@@ -2545,7 +2540,7 @@ void Foam::cellCuts::calcLoopsAndAddressing(const labelList& cutCells)
         {
             const labelList& loop = cellLoops_[cellI];
 
-            if (loop.size() > 0)
+            if (loop.size())
             {
                 Pout<< "cell:" << cellI << "  ";
                 writeCuts(Pout, loop, loopWeights(loop));
@@ -2632,7 +2627,7 @@ void Foam::cellCuts::check() const
 
         const labelList& loop = cellLoops_[cellI];
 
-        if (loop.size() > 0 && anchors.size() == 0)
+        if (loop.size() && anchors.empty())
         {
             FatalErrorIn("cellCuts::check()")
                 << "cell:" << cellI << " loop:" << loop
@@ -2671,11 +2666,7 @@ void Foam::cellCuts::check() const
             label own = mesh().faceOwner()[faceI];
             label nei = mesh().faceNeighbour()[faceI];
 
-            if
-            (
-                cellLoops_[own].size() == 0
-             && cellLoops_[nei].size() == 0
-            )
+            if (cellLoops_[own].empty() && cellLoops_[nei].empty())
             {
                 FatalErrorIn("cellCuts::check()")
                     << "Internal face:" << faceI << " cut by " << iter()
@@ -2689,7 +2680,7 @@ void Foam::cellCuts::check() const
         {
             label own = mesh().faceOwner()[faceI];
 
-            if (cellLoops_[own].size() == 0)
+            if (cellLoops_[own].empty())
             {
                 FatalErrorIn("cellCuts::check()")
                     << "Boundary face:" << faceI << " cut by " << iter()
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
index 4a6aa1d5a9..73f7bca59e 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
@@ -206,23 +206,22 @@ bool Foam::hexCellLooper::cut
     }
     else
     {
-        success = 
-            geomCellLooper::cut
-            (
-                refDir,
-                cellI,
-                vertIsCut,
-                edgeIsCut,
-                edgeWeight,
+        success = geomCellLooper::cut
+        (
+            refDir,
+            cellI,
+            vertIsCut,
+            edgeIsCut,
+            edgeWeight,
 
-                loop,
-                loopWeights
-            );
+            loop,
+            loopWeights
+        );
     }
 
     if (debug)
     {
-        if (loop.size() == 0)
+        if (loop.empty())
         {
             WarningIn("hexCellLooper")
                 << "could not cut cell " << cellI << endl;
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index 7c20fa191b..3572546e75 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -510,15 +510,14 @@ void Foam::topoCellLooper::walkSplitHex
             {
                 // Normal vertex on edge of face. Get edges connected to it
                 // which are not on faceI.
-                labelList nextEdges =
-                    getVertEdgesNonFace
-                    (
-                        cellI,
-                        faceI,
-                        vertI
-                    );
+                labelList nextEdges = getVertEdgesNonFace
+                (
+                    cellI,
+                    faceI,
+                    vertI
+                );
 
-                if (nextEdges.size() == 0)
+                if (nextEdges.empty())
                 {
                     // Cross to other face (there is only one since no edges)
                     const labelList& pFaces = mesh().pointFaces()[vertI];
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 0ebf692ab3..6cbf8ecfc0 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -38,13 +38,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(meshCutAndRemove, 0);
-
-}
-
+defineTypeNameAndDebug(Foam::meshCutAndRemove, 0);
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
 
@@ -116,12 +110,12 @@ Foam::label Foam::meshCutAndRemove::findCutCell
     {
         label cellI = cellLabels[labelI];
 
-        if (cuts.cellLoops()[cellI].size() > 0)
+        if (cuts.cellLoops()[cellI].size())
         {
             return cellI;
         }
     }
-    return -1;        
+    return -1;
 }
 
 
@@ -151,7 +145,7 @@ Foam::label Foam::meshCutAndRemove::findInternalFacePoint
         }
     }
 
-    if (pointLabels.size() == 0)
+    if (pointLabels.empty())
     {
         FatalErrorIn("meshCutAndRemove::findInternalFacePoint(const labelList&)")
             << "Empty pointLabels" << abort(FatalError);
@@ -212,7 +206,7 @@ void Foam::meshCutAndRemove::faceCells
 
     own = mesh().faceOwner()[faceI];
 
-    if (cellLoops[own].size() > 0 && (firstCommon(f, anchorPts[own]) == -1))
+    if (cellLoops[own].size() && firstCommon(f, anchorPts[own]) == -1)
     {
         // owner has been split and this is the removed part.
         own = -1;
@@ -224,7 +218,7 @@ void Foam::meshCutAndRemove::faceCells
     {
         nei = mesh().faceNeighbour()[faceI];
 
-        if (cellLoops[nei].size() > 0 && (firstCommon(f, anchorPts[nei]) == -1))
+        if (cellLoops[nei].size() && firstCommon(f, anchorPts[nei]) == -1)
         {
             nei = -1;
         }
@@ -711,7 +705,7 @@ void Foam::meshCutAndRemove::setRefinement
         {
             const labelList& loop = cellLoops[cellI];
 
-            if (loop.size() > 0)
+            if (loop.size())
             {
                 // Cell is cut. Uses only anchor points and loop itself.
                 forAll(loop, fp)
@@ -740,7 +734,7 @@ void Foam::meshCutAndRemove::setRefinement
                 {
                     usedPoint[cPoints[i]] = true;
                 }
-            }   
+            }
         }
 
 
@@ -822,7 +816,7 @@ void Foam::meshCutAndRemove::setRefinement
     {
         const labelList& loop = cellLoops[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             if (cutPatch[cellI] < 0 || cutPatch[cellI] >= patches.size())
             {
@@ -918,7 +912,7 @@ void Foam::meshCutAndRemove::setRefinement
 
         // Renumber face to include split edges.
         face newFace(addEdgeCutsToFace(faceI));
-        
+
         // Edge splitting the face. Convert edge to new vertex numbering.
         const edge& splitEdge = iter();
 
@@ -984,7 +978,7 @@ void Foam::meshCutAndRemove::setRefinement
         label f0Own = -1;
         label f1Own = -1;
 
-        if (cellLoops[own].size() == 0)
+        if (cellLoops[own].empty())
         {
             // Owner side is not split so keep both halves.
             f0Own = own;
@@ -1031,7 +1025,7 @@ void Foam::meshCutAndRemove::setRefinement
 
         if (nei != -1)
         {
-            if (cellLoops[nei].size() == 0)
+            if (cellLoops[nei].empty())
             {
                 f0Nei = nei;
                 f1Nei = nei;
@@ -1097,7 +1091,7 @@ void Foam::meshCutAndRemove::setRefinement
         bool modifiedFaceI = false;
 
         if (f0Own == -1)
-        {   
+        {
             if (f0Nei != -1)
             {
                 // f0 becomes external face (note:modFace will reverse face)
@@ -1125,7 +1119,7 @@ void Foam::meshCutAndRemove::setRefinement
         // f1 is added face (if at all)
 
         if (f1Own == -1)
-        {   
+        {
             if (f1Nei == -1)
             {
                 // f1 not needed.
@@ -1225,7 +1219,7 @@ void Foam::meshCutAndRemove::setRefinement
         {
             const labelList& eFaces = mesh().edgeFaces()[edgeI];
 
-            forAll(eFaces, i)    
+            forAll(eFaces, i)
             {
                 label faceI = eFaces[i];
 
@@ -1397,7 +1391,7 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
                     (debug & 2)
                  && (e != newE || newAddedPointI != addedPointI)
                 )
-                {        
+                {
                     Pout<< "meshCutAndRemove::updateMesh :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointI
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index e13c0a738b..6a97db6256 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -39,12 +39,7 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(meshCutter, 0);
-
-}
+defineTypeNameAndDebug(Foam::meshCutter, 0);
 
 
 // * * * * * * * * * * * * * Private Static Functions  * * * * * * * * * * * //
@@ -111,12 +106,12 @@ Foam::label Foam::meshCutter::findCutCell
     {
         label cellI = cellLabels[labelI];
 
-        if (cuts.cellLoops()[cellI].size() > 0)
+        if (cuts.cellLoops()[cellI].size())
         {
             return cellI;
         }
     }
-    return -1;        
+    return -1;
 }
 
 
@@ -146,7 +141,7 @@ Foam::label Foam::meshCutter::findInternalFacePoint
         }
     }
 
-    if (pointLabels.size() == 0)
+    if (pointLabels.empty())
     {
         FatalErrorIn("meshCutter::findInternalFacePoint(const labelList&)")
             << "Empty pointLabels" << abort(FatalError);
@@ -173,7 +168,7 @@ void Foam::meshCutter::faceCells
 
     own = mesh().faceOwner()[faceI];
 
-    if (cellLoops[own].size() > 0 && uses(f, anchorPts[own]))
+    if (cellLoops[own].size() && uses(f, anchorPts[own]))
     {
         own = addedCells_[own];
     }
@@ -184,7 +179,7 @@ void Foam::meshCutter::faceCells
     {
         nei = mesh().faceNeighbour()[faceI];
 
-        if (cellLoops[nei].size() > 0 && uses(f, anchorPts[nei]))
+        if (cellLoops[nei].size() && uses(f, anchorPts[nei]))
         {
             nei = addedCells_[nei];
         }
@@ -653,7 +648,7 @@ void Foam::meshCutter::setRefinement
 
     forAll(cellLoops, cellI)
     {
-        if (cellLoops[cellI].size() > 0)
+        if (cellLoops[cellI].size())
         {
             // Add a cell to the existing cell
             label addedCellI =
@@ -688,7 +683,7 @@ void Foam::meshCutter::setRefinement
     {
         const labelList& loop = cellLoops[cellI];
 
-        if (loop.size() > 0)
+        if (loop.size())
         {
             //
             // Convert loop (=list of cuts) into proper face.
@@ -769,7 +764,7 @@ void Foam::meshCutter::setRefinement
 
         // Renumber face to include split edges.
         face newFace(addEdgeCutsToFace(faceI));
-        
+
         // Edge splitting the face. Convert cuts to new vertex numbering.
         const edge& splitEdge = iter();
 
@@ -832,7 +827,7 @@ void Foam::meshCutter::setRefinement
         label f0Owner = -1;
         label f1Owner = -1;
 
-        if (cellLoops[own].size() == 0)
+        if (cellLoops[own].empty())
         {
             f0Owner = own;
             f1Owner = own;
@@ -875,7 +870,7 @@ void Foam::meshCutter::setRefinement
 
         if (nei != -1)
         {
-            if (cellLoops[nei].size() == 0)
+            if (cellLoops[nei].empty())
             {
                 f0Neighbour = nei;
                 f1Neighbour = nei;
@@ -935,7 +930,7 @@ void Foam::meshCutter::setRefinement
         {
             const labelList& eFaces = mesh().edgeFaces()[edgeI];
 
-            forAll(eFaces, i)    
+            forAll(eFaces, i)
             {
                 label faceI = eFaces[i];
 
@@ -970,7 +965,7 @@ void Foam::meshCutter::setRefinement
 
     forAll(cellLoops, cellI)
     {
-        if (cellLoops[cellI].size() > 0)
+        if (cellLoops[cellI].size())
         {
             const labelList& cllFaces = mesh().cells()[cellI];
 
@@ -991,7 +986,7 @@ void Foam::meshCutter::setRefinement
                             ", polyTopoChange&)"
                         )   << "Problem: edges added to face which does "
                             << " not use a marked cut" << endl
-                            << "faceI:" << faceI << endl    
+                            << "faceI:" << faceI << endl
                             << "face:" << f << endl
                             << "newFace:" << addEdgeCutsToFace(faceI)
                             << abort(FatalError);
@@ -1000,7 +995,7 @@ void Foam::meshCutter::setRefinement
                     // Get (new or original) owner and neighbour of faceI
                     label own, nei;
                     faceCells(cuts, faceI, own, nei);
-                    
+
                     modFace
                     (
                         meshMod,
@@ -1142,7 +1137,7 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
                     (debug & 2)
                  && (e != newE || newAddedPointI != addedPointI)
                 )
-                {        
+                {
                     Pout<< "meshCutter::updateMesh :"
                         << " updating addedPoints for edge " << e
                         << " from " << addedPointI
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
index de9f54ac39..60a27f5365 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
@@ -196,7 +196,7 @@ void Foam::multiDirRefinement::addCells
 
         labelList& added = addedCells_[masterI];
 
-        if (added.size() == 0)
+        if (added.empty())
         {
             added.setSize(2);
             added[0] = masterI;
@@ -383,7 +383,7 @@ void Foam::multiDirRefinement::refineHex8
     {
         label oldCellI = cellMap[cellI];
 
-        if (addedCells_[oldCellI].size() > 0)
+        if (addedCells_[oldCellI].size())
         {
             addedCells_[oldCellI][nAddedCells[oldCellI]++] = cellI;
         }
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.C b/src/dynamicMesh/motionSmoother/motionSmoother.C
index 3015274ba5..5307352302 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.C
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -826,7 +826,7 @@ bool Foam::motionSmoother::scaleMesh
     const label nAllowableErrors
 )
 {
-    if (!smoothMesh && adaptPatchIDs_.size() == 0)
+    if (!smoothMesh && adaptPatchIDs_.empty())
     {
         FatalErrorIn("motionSmoother::scaleMesh(const bool")
             << "You specified both no movement on the internal mesh points"
@@ -992,7 +992,7 @@ bool Foam::motionSmoother::scaleMesh
                 << endl;
         }
 
-        if (adaptPatchIDs_.size() != 0)
+        if (adaptPatchIDs_.size())
         {
             // Scale conflicting patch points
             scaleField(pp_.meshPoints(), usedPoints, errorReduction, scale_);
@@ -1005,7 +1005,7 @@ bool Foam::motionSmoother::scaleMesh
 
         for (label i = 0; i < nSmoothScale; i++)
         {
-            if (adaptPatchIDs_.size() != 0)
+            if (adaptPatchIDs_.size())
             {
                 // Smooth patch values
                 pointScalarField oldScale(scale_);
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index b8a028b84b..237a2f3cb7 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -36,12 +36,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(faceCoupleInfo, 0);
-
-}
+defineTypeNameAndDebug(Foam::faceCoupleInfo, 0);
 
 const Foam::scalar Foam::faceCoupleInfo::angleTol_ = 1E-3;
 
@@ -541,7 +536,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
 
         const labelList& stringedEdges = masterToCutEdges[masterEdgeI];
 
-        if (stringedEdges.size() == 0)
+        if (stringedEdges.empty())
         {
             FatalErrorIn
             (
@@ -1421,16 +1416,15 @@ Foam::label Foam::faceCoupleInfo::geometricMatchEdgeFaces
             {
                 label masterFaceI = masterFaces[i];
 
-                if (masterToCutFaces[masterFaces[i]].size() == 0)
+                if (masterToCutFaces[masterFaces[i]].empty())
                 {
-                    scalar dist =
-                        maxDistance
-                        (
-                            cutF,
-                            cutPoints,
-                            masterPatch()[masterFaceI],
-                            masterPatch().points()
-                        );
+                    scalar dist = maxDistance
+                    (
+                        cutF,
+                        cutPoints,
+                        masterPatch()[masterFaceI],
+                        masterPatch().points()
+                    );
 
                     if (dist < minDist)
                     {
@@ -2065,7 +2059,7 @@ Foam::faceCoupleInfo::faceCoupleInfo
 
     if
     (
-        masterAddressing.size() > 0
+        masterAddressing.size()
      && min(masterAddressing) < masterMesh.nInternalFaces()
     )
     {
@@ -2079,7 +2073,7 @@ Foam::faceCoupleInfo::faceCoupleInfo
     }
     if
     (
-        slaveAddressing.size() > 0
+        slaveAddressing.size()
      && min(slaveAddressing) < slaveMesh.nInternalFaces()
     )
     {
@@ -2156,7 +2150,7 @@ Foam::Map<Foam::labelList> Foam::faceCoupleInfo::makeMap
 
     forAll(lst, i)
     {
-        if (lst[i].size() > 0)
+        if (lst[i].size())
         {
             map.insert(i, lst[i]);
         }
diff --git a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
index 1dd63f38c8..73b285f74e 100644
--- a/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/attachPolyTopoChanger/attachPolyTopoChanger.C
@@ -85,16 +85,15 @@ void Foam::attachPolyTopoChanger::attach(const bool removeEmptyPatches)
 
         forAll (oldPatches, patchI)
         {
-            if (oldPatches[patchI].size() > 0)
+            if (oldPatches[patchI].size())
             {
-                newPatches[nNewPatches] =
-                    oldPatches[patchI].clone
-                    (
-                        mesh_.boundaryMesh(),
-                        nNewPatches,
-                        oldPatches[patchI].size(),
-                        oldPatches[patchI].start()
-                    ).ptr();
+                newPatches[nNewPatches] = oldPatches[patchI].clone
+                (
+                    mesh_.boundaryMesh(),
+                    nNewPatches,
+                    oldPatches[patchI].size(),
+                    oldPatches[patchI].start()
+                ).ptr();
 
                 nNewPatches++;
             }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 65836c81c8..6015f1b64a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -196,8 +196,8 @@ bool Foam::addPatchCellLayer::sameEdgeNeighbour
     return
         !doneEdge[edgeI]                            // not yet handled
      && (
-            addedPoints_[e[0]].size() != 0          // is extruded
-         || addedPoints_[e[1]].size() != 0
+            addedPoints_[e[0]].size()               // is extruded
+         || addedPoints_[e[1]].size()
         )
      && (
             nbrFace(globalEdgeFaces, edgeI, thisGlobalFaceI)
@@ -232,10 +232,7 @@ Foam::labelPair Foam::addPatchCellLayer::getEdgeString
         if
         (
             !doneEdge[edgeI]
-         && (
-                addedPoints_[e[0]].size() != 0
-             || addedPoints_[e[1]].size() != 0
-            )
+         && ( addedPoints_[e[0]].size() || addedPoints_[e[1]].size() )
         )
         {
             startFp = fp;
@@ -529,7 +526,7 @@ Foam::labelListList Foam::addPatchCellLayer::addedCells
     {
         const labelList& faceLabels = layerFaces[patchFaceI];
 
-        if (faceLabels.size() > 0)
+        if (faceLabels.size())
         {
             labelList& added = layerCells[patchFaceI];
             added.setSize(faceLabels.size()-1);
@@ -862,7 +859,7 @@ void Foam::addPatchCellLayer::setRefinement
 
     forAll(firstLayerDisp, patchPointI)
     {
-        if (addedPoints_[patchPointI].size() > 0)
+        if (addedPoints_[patchPointI].size())
         {
             label meshPointI = meshPoints[patchPointI];
 
@@ -965,7 +962,7 @@ void Foam::addPatchCellLayer::setRefinement
     {
         label meshFaceI = pp.addressing()[patchFaceI];
 
-        if (addedCells[patchFaceI].size() > 0)
+        if (addedCells[patchFaceI].size())
         {
             layerFaces_[patchFaceI].setSize(addedCells[patchFaceI].size() + 1);
             layerFaces_[patchFaceI][0] = meshFaceI;
@@ -981,7 +978,7 @@ void Foam::addPatchCellLayer::setRefinement
             {
                 forAll(f, fp)
                 {
-                    if (addedPoints_[f[fp]].size() == 0)
+                    if (addedPoints_[f[fp]].empty())
                     {
                         // Keep original point
                         newFace[fp] = meshPoints[f[fp]];
@@ -1045,7 +1042,7 @@ void Foam::addPatchCellLayer::setRefinement
     //
     forAll(pp, patchFaceI)
     {
-        if (addedCells[patchFaceI].size() > 0)
+        if (addedCells[patchFaceI].size())
         {
             label meshFaceI = pp.addressing()[patchFaceI];
 
@@ -1235,15 +1232,15 @@ void Foam::addPatchCellLayer::setRefinement
                     {
                         // layer 0 gets all the truncation of neighbouring
                         // faces with more layers.
-                        if (addedPoints_[vEnd].size() != 0)
+                        if (addedPoints_[vEnd].size())
                         {
-                            newFp +=
+                            newFp += 
                                 addedPoints_[vEnd].size() - numEdgeSideFaces;
                         }
-                        if (addedPoints_[vStart].size() != 0)
+                        if (addedPoints_[vStart].size())
                         {
                             newFp +=
-                                addedPoints_[vStart].size()  - numEdgeSideFaces;
+                                addedPoints_[vStart].size() - numEdgeSideFaces;
                         }
                     }
 
@@ -1266,7 +1263,7 @@ void Foam::addPatchCellLayer::setRefinement
                         forAll(stringedVerts, stringedI)
                         {
                             label v = stringedVerts[stringedI];
-                            if (addedPoints_[v].size() > 0)
+                            if (addedPoints_[v].size())
                             {
                                 label offset =
                                     addedPoints_[v].size() - numEdgeSideFaces;
@@ -1287,7 +1284,7 @@ void Foam::addPatchCellLayer::setRefinement
                     // add points between stringed vertices (end)
                     if (numEdgeSideFaces < addedPoints_[vEnd].size())
                     {
-                        if (i == 0 && addedPoints_[vEnd].size() != 0)
+                        if (i == 0 && addedPoints_[vEnd].size())
                         {
                             label offset =
                                 addedPoints_[vEnd].size() - numEdgeSideFaces;
@@ -1306,7 +1303,7 @@ void Foam::addPatchCellLayer::setRefinement
                     forAllReverse(stringedVerts, stringedI)
                     {
                         label v = stringedVerts[stringedI];
-                        if (addedPoints_[v].size() > 0)
+                        if (addedPoints_[v].size())
                         {
                             label offset =
                                 addedPoints_[v].size() - numEdgeSideFaces;
@@ -1327,7 +1324,7 @@ void Foam::addPatchCellLayer::setRefinement
                     // add points between stringed vertices (start)
                     if (numEdgeSideFaces < addedPoints_[vStart].size())
                     {
-                        if (i == 0 && addedPoints_[vStart].size() != 0)
+                        if (i == 0 && addedPoints_[vStart].size())
                         {
                             label offset =
                                 addedPoints_[vStart].size() - numEdgeSideFaces;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index a1bb3f24db..ea6a7674e4 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -135,9 +135,9 @@ class addPatchCellLayer
 
             void operator()(labelList& x, const labelList& y) const
             {
-                if (x.size() == 0)
+                if (x.empty())
                 {
-                    if (y.size() > 0)
+                    if (y.size())
                     {
                         x = y;
                     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
index 59cbdfd408..caa3642f5c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.C
@@ -897,7 +897,7 @@ void Foam::combineFaces::setUnrefinement
 
         faceList& faces = faceSetsVertices_[setI];
 
-        if (faces.size() == 0)
+        if (faces.empty())
         {
             FatalErrorIn
             (
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 0d2e4cb2cf..53357139ac 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -304,7 +304,7 @@ bool Foam::edgeCollapser::collapseEdge(const label edgeI, const label master)
 
             label freeRegion = -1;
 
-            if (freeRegions_.size() > 0)
+            if (freeRegions_.size())
             {
                 freeRegion = freeRegions_.removeHead();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
index 57a9738861..3bb5c345d3 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
@@ -441,7 +441,7 @@ void Foam::faceCollapser::setRefinement
                 }
             }
 
-            if (edgePoints.size() > 0)
+            if (edgePoints.size())
             {
                 edgePoints.shrink();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index ca81927fcc..fa5ae3ae9d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -532,7 +532,7 @@ Foam::label Foam::hexRef8::getAnchorCell
     const label pointI
 ) const
 {
-    if (cellAnchorPoints[cellI].size() > 0)
+    if (cellAnchorPoints[cellI].size())
     {
         label index = findIndex(cellAnchorPoints[cellI], pointI);
 
@@ -4017,7 +4017,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
         {
             const labelList& addedCells = cellAddedCells[cellI];
 
-            if (addedCells.size() > 0)
+            if (addedCells.size())
             {
                 // Cell was split.
                 history_.storeSplit(cellI, addedCells);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
index d54c1bd92d..76a38381e8 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C
@@ -45,7 +45,7 @@ public:
 
     void operator()(face& x, const face& y) const
     {
-        if (x.size() > 0)
+        if (x.size())
         {
             label j = 0;
             forAll(x, i)
@@ -134,7 +134,7 @@ void Foam::localPointRegion::countPointRegions
         {
             const face& f = mesh.faces()[faceI];
 
-            if (minRegion[faceI].size() == 0)
+            if (minRegion[faceI].empty())
             {
                 FatalErrorIn("localPointRegion::countPointRegions(..)")
                     << "Face from candidateFace without minRegion set." << endl
@@ -364,7 +364,7 @@ void Foam::localPointRegion::calcPointRegions
             {
                 label faceI = cFaces[cFaceI];
 
-                if (minRegion[faceI].size() > 0)
+                if (minRegion[faceI].size())
                 {
                     const face& f = mesh.faces()[faceI];
 
@@ -391,7 +391,7 @@ void Foam::localPointRegion::calcPointRegions
             {
                 label faceI = cFaces[cFaceI];
 
-                if (minRegion[faceI].size() > 0)
+                if (minRegion[faceI].size())
                 {
                     const face& f = mesh.faces()[faceI];
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
index 2c7502ebca..0a46952306 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
@@ -286,7 +286,7 @@ void Foam::polyTopoChange::getMergeSets
 
             objectMap& mergeSet = cellsFromCells[setI];
 
-            if (mergeSet.masterObjects().size() == 0)
+            if (mergeSet.masterObjects().empty())
             {
                 // First occurrence of master cell mergeCellI
 
@@ -569,7 +569,7 @@ Foam::label Foam::polyTopoChange::getCellOrder
                     }
                 }
             }
-            while (nextCell.size() > 0);
+            while (nextCell.size());
         }
     }
 
@@ -1223,7 +1223,7 @@ void Foam::polyTopoChange::calcFaceInflationMaps
 
     facesFromPoints.setSize(faceFromPoint_.size());
 
-    if (faceFromPoint_.size() > 0)
+    if (faceFromPoint_.size())
     {
         label nFacesFromPoints = 0;
 
@@ -1269,7 +1269,7 @@ void Foam::polyTopoChange::calcFaceInflationMaps
 
     facesFromEdges.setSize(faceFromEdge_.size());
 
-    if (faceFromEdge_.size() > 0)
+    if (faceFromEdge_.size())
     {
         label nFacesFromEdges = 0;
 
@@ -1333,7 +1333,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 {
     cellsFromPoints.setSize(cellFromPoint_.size());
 
-    if (cellFromPoint_.size() > 0)
+    if (cellFromPoint_.size())
     {
         label nCellsFromPoints = 0;
 
@@ -1351,7 +1351,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 
     cellsFromEdges.setSize(cellFromEdge_.size());
 
-    if (cellFromEdge_.size() > 0)
+    if (cellFromEdge_.size())
     {
         label nCellsFromEdges = 0;
 
@@ -1369,7 +1369,7 @@ void Foam::polyTopoChange::calcCellInflationMaps
 
     cellsFromFaces.setSize(cellFromFace_.size());
 
-    if (cellFromFace_.size() > 0)
+    if (cellFromFace_.size())
     {
         label nCellsFromFaces = 0;
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
index 67edf19ff6..e2ea3c2869 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeI.H
@@ -40,7 +40,7 @@ inline bool Foam::polyTopoChange::pointRemoved(const label pointI) const
 
 inline bool Foam::polyTopoChange::faceRemoved(const label faceI) const
 {
-    return faces_[faceI].size() == 0;
+    return faces_[faceI].empty();
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
index a4cce8716a..4d3f6d9696 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementHistory.C
@@ -153,7 +153,7 @@ Foam::Istream& Foam::operator>>(Istream& is, refinementHistory::splitCell8& sc)
 
     is >> sc.parent_ >> addedCells;
 
-    if (addedCells.size() > 0)
+    if (addedCells.size())
     {
         sc.addedCellsPtr_.reset(new FixedList<label, 8>(addedCells));
     }
@@ -216,7 +216,7 @@ Foam::label Foam::refinementHistory::allocateSplitCell
 {
     label index = -1;
 
-    if (freeSplitCells_.size() > 0)
+    if (freeSplitCells_.size())
     {
         index = freeSplitCells_.remove();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index c6463c557c..0ea48b115f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -74,7 +74,7 @@ class removePoints
             {
                 if (y.size() > 0)
                 {
-                    if (x.size() == 0)
+                    if (x.empty())
                     {
                         x = y;
                     }
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index c7003c5e14..82e77d7674 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -1277,7 +1277,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                             // Get points on current edge
                             const labelList& curPime = pime[curEdges[curEdgeI]];
 
-                            if (curPime.size() > 0)
+                            if (curPime.size())
                             {
                                 changed = true;
                                 // Pout << "curPime: " << curPime << endl;
@@ -1562,7 +1562,7 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
                             // Get points on current edge
                             const labelList& curPise = pise[curEdges[curEdgeI]];
 
-                            if (curPise.size() > 0)
+                            if (curPise.size())
                             {
                                 changed = true;
 //                                 Pout << "curPise: " << curPise << endl;
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 6b090fb0d4..d15a6ddea5 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -151,7 +151,7 @@ void Foam::enrichedPatch::calcCutFaces() const
         vector normal = curLocalFace.normal(lp);
         normal /= mag(normal);
 
-        while (edgeSeeds.size() > 0)
+        while (edgeSeeds.size())
         {
 //             Pout << "edgeSeeds.size(): " << edgeSeeds.size() << endl;
             const edge curEdge = edgeSeeds.removeHead();
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index 85f01c7d37..bad4dd118e 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -136,7 +136,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 //             Info << "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl;
             // If there are no points on the edge, skip everything
             // If there is only one point, no need for sorting
-            if (slavePointsOnEdge.size() > 0)
+            if (slavePointsOnEdge.size())
             {
                 // Sort edge points in order
                 scalarField edgePointWeights(slavePointsOnEdge.size());
@@ -287,7 +287,7 @@ void Foam::enrichedPatch::calcEnrichedFaces
 
             // If there are no points on the edge, skip everything
             // If there is only one point, no need for sorting
-            if (masterPointsOnEdge.size() > 0)
+            if (masterPointsOnEdge.size())
             {
                 // Sort edge points in order
                 scalarField edgePointWeights(masterPointsOnEdge.size());
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index 78b0581331..0f8dd3603a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -90,8 +90,8 @@ void Foam::slidingInterface::checkDefinition()
     // Check the sizes and set up state
     if
     (
-        mesh.faceZones()[masterFaceZoneID_.index()].size() == 0
-     || mesh.faceZones()[slaveFaceZoneID_.index()].size() == 0
+        mesh.faceZones()[masterFaceZoneID_.index()].empty()
+     || mesh.faceZones()[slaveFaceZoneID_.index()].empty()
     )
     {
         FatalErrorIn("void slidingInterface::checkDefinition()")
@@ -431,7 +431,7 @@ void Foam::slidingInterface::modifyMotionPoints(pointField& motionPoints) const
     // Get point from the cut zone
     const labelList& cutPoints = mesh.pointZones()[cutPointZoneID_.index()];
 
-    if (cutPoints.size() > 0 && !projectedSlavePointsPtr_)
+    if (cutPoints.size() && !projectedSlavePointsPtr_)
     {
         return;
     }
diff --git a/src/edgeMesh/edgeMesh.C b/src/edgeMesh/edgeMesh.C
index 576bfb1738..6a3933c84f 100644
--- a/src/edgeMesh/edgeMesh.C
+++ b/src/edgeMesh/edgeMesh.C
@@ -123,7 +123,7 @@ Foam::label Foam::edgeMesh::regions(labelList& edgeRegion) const
         edgeRegion[startEdgeI] = currentRegion;
         labelList edgesToVisit(1, startEdgeI);
 
-        while (edgesToVisit.size() > 0)
+        while (edgesToVisit.size())
         {
             // neighbours of current edgesToVisit
             DynamicList<label> newEdgesToVisit(edgesToVisit.size());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 89fc89bfcb..78bf174535 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -131,7 +131,7 @@ void fanFvPatchField<Type>::autoMap
     jumpCyclicFvPatchField<Type>::autoMap(m);
 
     // Jump is half size. Expand to full size, map and truncate.
-    if (jump_.size() > 0 && jump_.size() == this->size()/2)
+    if (jump_.size() && jump_.size() == this->size()/2)
     {
         label oldSize = jump_.size();
         jump_.setSize(this->size());
@@ -157,7 +157,7 @@ void fanFvPatchField<Type>::rmap
     jumpCyclicFvPatchField<Type>::rmap(ptf, addr);
 
     // Jump is half size. Expand to full size, map and truncate.
-    if (jump_.size() > 0 && jump_.size() == this->size()/2)
+    if (jump_.size() && jump_.size() == this->size()/2)
     {
         label oldSize = jump_.size();
         jump_.setSize(this->size());
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index 3465757afb..d29b694aca 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -207,7 +207,7 @@ void timeVaryingMappedFixedValueFvPatchField<Type>::autoMap
 )
 {
     fixedValueFvPatchField<Type>::autoMap(m);
-    if (startSampledValues_.size() > 0)
+    if (startSampledValues_.size())
     {
         startSampledValues_.autoMap(m);
         endSampledValues_.autoMap(m);
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index 4f87176be1..979d85e0d1 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
@@ -358,11 +358,7 @@ ITstream& fvSchemes::ddtScheme(const word& name) const
         Info<< "Lookup ddtScheme for " << name << endl;
     }
 
-    if
-    (
-        ddtSchemes_.found(name)
-     || !defaultDdtScheme_.size()
-    )
+    if (ddtSchemes_.found(name) || defaultDdtScheme_.empty())
     {
         return ddtSchemes_.lookup(name);
     }
@@ -381,11 +377,7 @@ ITstream& fvSchemes::d2dt2Scheme(const word& name) const
         Info<< "Lookup d2dt2Scheme for " << name << endl;
     }
 
-    if
-    (
-        d2dt2Schemes_.found(name)
-     || !defaultD2dt2Scheme_.size()
-    )
+    if (d2dt2Schemes_.found(name) || defaultD2dt2Scheme_.empty())
     {
         return d2dt2Schemes_.lookup(name);
     }
@@ -407,7 +399,7 @@ ITstream& fvSchemes::interpolationScheme(const word& name) const
     if
     (
         interpolationSchemes_.found(name)
-     || !defaultInterpolationScheme_.size()
+     || defaultInterpolationScheme_.empty()
     )
     {
         return interpolationSchemes_.lookup(name);
@@ -427,7 +419,7 @@ ITstream& fvSchemes::divScheme(const word& name) const
         Info<< "Lookup divScheme for " << name << endl;
     }
 
-    if (divSchemes_.found(name) || !defaultDivScheme_.size())
+    if (divSchemes_.found(name) || defaultDivScheme_.empty())
     {
         return divSchemes_.lookup(name);
     }
@@ -446,7 +438,7 @@ ITstream& fvSchemes::gradScheme(const word& name) const
         Info<< "Lookup gradScheme for " << name << endl;
     }
 
-    if (gradSchemes_.found(name) || !defaultGradScheme_.size())
+    if (gradSchemes_.found(name) || defaultGradScheme_.empty())
     {
         return gradSchemes_.lookup(name);
     }
@@ -465,7 +457,7 @@ ITstream& fvSchemes::snGradScheme(const word& name) const
         Info<< "Lookup snGradScheme for " << name << endl;
     }
 
-    if (snGradSchemes_.found(name) || !defaultSnGradScheme_.size())
+    if (snGradSchemes_.found(name) || defaultSnGradScheme_.empty())
     {
         return snGradSchemes_.lookup(name);
     }
@@ -484,7 +476,7 @@ ITstream& fvSchemes::laplacianScheme(const word& name) const
         Info<< "Lookup laplacianScheme for " << name << endl;
     }
 
-    if (laplacianSchemes_.found(name) || !defaultLaplacianScheme_.size())
+    if (laplacianSchemes_.found(name) || defaultLaplacianScheme_.empty())
     {
         return laplacianSchemes_.lookup(name);
     }
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
index b3d72c3b5a..1812d2648d 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceStencil/faceStencil.C
@@ -245,9 +245,9 @@ void Foam::faceStencil::unionEqOp::operator()
     const labelList& y
 ) const
 {
-    if (y.size() > 0)
+    if (y.size())
     {
-        if (x.size() == 0)
+        if (x.empty())
         {
             x = y;
         }
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 8d47225f6c..1192ef2357 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -58,10 +58,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(fvMesh, 0);
-}
+defineTypeNameAndDebug(Foam::fvMesh, 0);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -302,7 +299,7 @@ void Foam::fvMesh::addFvPatches
     const bool validBoundary
 )
 {
-    if (boundary().size() > 0)
+    if (boundary().size())
     {
         FatalErrorIn
         (
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 2d58e88dd3..34a8419f4d 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -135,7 +135,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
 
     scalar skewCoeff = 0.0;
 
-    if (Sf.internalField().size() > 0)
+    if (Sf.internalField().size())
     {
         skewCoeff = max(mag(SkewCorrVecs)/mag(d)).value();
     }
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
index dfb7d4ac61..178d1d1b2a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
@@ -362,7 +362,7 @@ Foam::displacementInterpolationFvMotionSolver::curPoints() const
     vectorField zoneDisp(displacements_.size(), vector::zero);
     forAll(zoneDisp, zoneI)
     {
-        if (times_[zoneI].size() > 0)
+        if (times_[zoneI].size())
         {
             zoneDisp[zoneI] = interpolateXY
             (
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
index 5a289b7b5b..09dfcae98a 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
@@ -75,7 +75,7 @@ Foam::tmp<Foam::scalarField> Foam::inverseDistanceDiffusivity::y() const
 
     labelHashSet patchSet(mesh.boundaryMesh().patchSet(patchNames_));
 
-    if (patchSet.size() > 0)
+    if (patchSet.size())
     {
         return tmp<scalarField>
         (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 9e5c5eb595..68e0151f85 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -195,7 +195,7 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
     // Get fixed points (bit of a hack)
     const pointZone* zonePtr = NULL;
 
-    if (frozenPointsZone_.size() > 0)
+    if (frozenPointsZone_.size())
     {
         const pointZoneMesh& pZones = mesh.pointZones();
 
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index c3a57c5cd0..ec1d09a00f 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -231,7 +231,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
     facei_ = -1;
     scalar trackFraction = 0.0;
 
-    if (faces.size() == 0) // inside cell
+    if (faces.empty())  // inside cell
     {
         trackFraction = 1.0;
         position_ = endPosition;
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index aeee1e1844..d84f2bb195 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -172,7 +172,7 @@ void Foam::parcel::readFields
     }
 
     // read the liquid molar fractions
-    if (c.size() > 0)
+    if (c.size())
     {
         Cloud<parcel>::const_iterator iter = c.begin();
         const parcel& p0 = iter();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index 331f2df5bc..fce8ea2321 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -90,7 +90,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
  
     // check number of entries in innerConeAngle list
-    if (innerConeAngle_.size() < 1)
+    if (innerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
@@ -99,7 +99,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
 
     // check number of entries in outerConeAngle list
-    if (outerConeAngle_.size() < 1)
+    if (outerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
diff --git a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
index 6788cdcd28..a4a08b08fa 100644
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
@@ -232,11 +232,9 @@ void distribution::insertMissingKeys()
 
     sort(keys);
 
-    label k;
-
-    if (keys.size() > 0)
+    if (keys.size())
     {
-        for (k = keys[0]; k < keys[keys.size()-1]; k++)
+        for (label k = keys[0]; k < keys[keys.size()-1]; k++)
         {
             iter = find(k);
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index 1bc4d6bdbb..6bb5a43da3 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -35,11 +35,11 @@ void Foam::tetherPotentialList::readTetherPotentialDict
     const List<label>& tetherIds
 )
 {
-    if (!tetherIds.size())
+    if (tetherIds.empty())
     {
         Info<< nl << "No tethered molecules found." << endl;
 
-        idMap_.setSize(0);
+        idMap_.clear();
     }
     else
     {
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index 3952f435d6..8bc65470bc 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -263,7 +263,7 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
             nbs.erase(nb);
         }
 
-        if (nbs.size() != 0)
+        if (nbs.size())
         {
             FatalErrorIn("getPointNeighbours")
                 << "Problem: fast pointNeighbours routine did not find "
diff --git a/src/meshTools/cellFeatures/cellFeatures.C b/src/meshTools/cellFeatures/cellFeatures.C
index 4f9c3341fb..605624473b 100644
--- a/src/meshTools/cellFeatures/cellFeatures.C
+++ b/src/meshTools/cellFeatures/cellFeatures.C
@@ -282,7 +282,7 @@ void Foam::cellFeatures::calcSuperFaces() const
 
         label superFaceI = toSuperFace[faceI];
 
-        if (faces[superFaceI].size() == 0)
+        if (faces[superFaceI].empty())
         {
             // Superface not yet constructed.
 
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
index dfbbcee145..5d54517f0b 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
@@ -139,7 +139,7 @@ void Foam::directMappedPolyPatch::findSamples
     {
         case NEARESTCELL:
         {
-            if (samplePatch_.size() != 0 && samplePatch_ != "none")
+            if (samplePatch_.size() && samplePatch_ != "none")
             {
                 FatalErrorIn
                 (
@@ -196,7 +196,7 @@ void Foam::directMappedPolyPatch::findSamples
 
             const polyPatch& pp = boundaryMesh()[patchI];
 
-            if (pp.size() == 0)
+            if (pp.empty())
             {
                 forAll(samples, sampleI)
                 {
@@ -267,7 +267,7 @@ void Foam::directMappedPolyPatch::findSamples
 
         case NEARESTFACE:
         {
-            if (samplePatch_.size() != 0 && samplePatch_ != "none")
+            if (samplePatch_.size() && samplePatch_ != "none")
             {
                 FatalErrorIn
                 (
diff --git a/src/meshTools/indexedOctree/indexedOctree.C b/src/meshTools/indexedOctree/indexedOctree.C
index 233dac95f5..385fb2d314 100644
--- a/src/meshTools/indexedOctree/indexedOctree.C
+++ b/src/meshTools/indexedOctree/indexedOctree.C
@@ -224,7 +224,7 @@ Foam::indexedOctree<Type>::divide
     {
         labelList& subIndices = dividedIndices[octant];
 
-        if (subIndices.size() > 0)
+        if (subIndices.size())
         {
             if (!replaced)
             {
@@ -1052,7 +1052,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
 {
     pointIndexHit hitInfo;
 
-    if (nodes_.size() > 0)
+    if (nodes_.size())
     {
         const treeBoundBox& treeBb = nodes_[0].bb_;
 
@@ -1457,11 +1457,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
     label nearestShapeI = -1;
     point nearestPoint;
 
-    if (nodes_.size() == 0)
-    {
-        nearestPoint = vector::zero;
-    }
-    else
+    if (nodes_.size())
     {
         findNearest
         (
@@ -1473,6 +1469,10 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
             nearestPoint
         );
     }
+    else
+    {
+        nearestPoint = vector::zero;
+    }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
 }
@@ -1489,11 +1489,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
     label nearestShapeI = -1;
     point nearestPoint;
 
-    if (nodes_.size() == 0)
-    {
-        nearestPoint = vector::zero;
-    }
-    else
+    if (nodes_.size())
     {
         findNearest
         (
@@ -1506,6 +1502,10 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
             nearestPoint
         );
     }
+    else
+    {
+        nearestPoint = vector::zero;
+    }
 
     return pointIndexHit(nearestShapeI != -1, nearestPoint, nearestShapeI);
 }
@@ -1544,7 +1544,7 @@ Foam::labelList Foam::indexedOctree<Type>::findBox
     // Storage for labels of shapes inside bb. Size estimate.
     labelHashSet elements(shapes_.size() / 100);
 
-    if (nodes_.size() > 0)
+    if (nodes_.size())
     {
         findBox(0, searchBox, elements);
     }
@@ -1561,7 +1561,7 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
     const point& sample
 ) const
 {
-    if (nodes_.size() == 0)
+    if (nodes_.empty())
     {
         // Empty tree. Return what?
         return nodePlusOctant(nodeI, 0);
@@ -1599,7 +1599,7 @@ Foam::indexedOctree<Type>::getVolumeType
     const point& sample
 ) const
 {
-    if (nodes_.size() == 0)
+    if (nodes_.empty())
     {
         return UNKNOWN;
     }
diff --git a/src/meshTools/indexedOctree/indexedOctree.H b/src/meshTools/indexedOctree/indexedOctree.H
index 68e63626e4..b4aad9a305 100644
--- a/src/meshTools/indexedOctree/indexedOctree.H
+++ b/src/meshTools/indexedOctree/indexedOctree.H
@@ -372,7 +372,7 @@ public:
             //- Top bounding box
             const treeBoundBox& bb() const
             {
-                if (nodes_.size() == 0)
+                if (nodes_.empty())
                 {
                     FatalErrorIn("indexedOctree<Type>::bb() const")
                         << "Tree is empty" << abort(FatalError);
diff --git a/src/meshTools/octree/octree.C b/src/meshTools/octree/octree.C
index 0dbda8434a..554af3ad5a 100644
--- a/src/meshTools/octree/octree.C
+++ b/src/meshTools/octree/octree.C
@@ -621,12 +621,12 @@ void Foam::octree<Type>::printStats(Ostream& os) const
         << "  nLeaves  :" << nLeaves() << endl
         << "  nEntries :" << nEntries() << endl;
 
-    if (nLeaves() > 0 && shapes().size() > 0)
+    if (nLeaves() && shapes().size())
     {
         os
             << "  Cells per leaf :"
             << scalar(nEntries())/nLeaves()
-            << endl
+            << nl
             << "  Every cell in  :"
             << scalar(nEntries())/shapes().size() << " cubes"
             << endl;
diff --git a/src/meshTools/octree/octreeLine.C b/src/meshTools/octree/octreeLine.C
index 540721e950..76e56177b6 100644
--- a/src/meshTools/octree/octreeLine.C
+++ b/src/meshTools/octree/octreeLine.C
@@ -120,7 +120,7 @@ bool Foam::octreeLine<Type>::getNextLeaf()
         // Get intersections and sort.
         calcSortedIntersections();
     }
-    while (sortedIntersections_.size() == 0);
+    while (sortedIntersections_.empty());
 
     return true;
 }
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/meshTools/octree/treeBoundBox.C
index c511f74758..ce62c47192 100644
--- a/src/meshTools/octree/treeBoundBox.C
+++ b/src/meshTools/octree/treeBoundBox.C
@@ -117,7 +117,7 @@ Foam::treeBoundBox::treeBoundBox(const UList<point>& points)
 :
     boundBox()
 {
-    if (points.size() == 0)
+    if (points.empty())
     {
         WarningIn
         (
@@ -148,7 +148,7 @@ Foam::treeBoundBox::treeBoundBox
 :
     boundBox()
 {
-    if (points.size() == 0 || meshPoints.size() == 0)
+    if (points.empty() || meshPoints.empty())
     {
         WarningIn
         (
diff --git a/src/meshTools/octree/treeNode.C b/src/meshTools/octree/treeNode.C
index a0ff57fffe..3e503f13a0 100644
--- a/src/meshTools/octree/treeNode.C
+++ b/src/meshTools/octree/treeNode.C
@@ -1381,11 +1381,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const treeNode<Type>& tn)
     {
         if (tn.subNodes_[octant])
         {
-            if
-            (
-                tn.isNode(octant)
-             || (tn.getLeafPtr(octant)->indices().size() != 0)
-            )
+            if (tn.isNode(octant) || tn.getLeafPtr(octant)->indices().size())
             {
                 nPtrs++;
             }
@@ -1409,7 +1405,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const treeNode<Type>& tn)
                 os  << token::SPACE << octant << token::SPACE << *subNodePtr
                     << token::NL;
             }
-            else if (tn.getLeafPtr(octant)->indices().size() != 0)
+            else if (tn.getLeafPtr(octant)->indices().size())
             {
                 // treeLeaf: mark by putting index invalid
                 const treeLeaf<Type>* subLeafPtr = tn.getLeafPtr(octant);
diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
index ec18bbeeb0..0d4ec63faa 100644
--- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
+++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C
@@ -720,7 +720,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh)
             }
         }
 
-        if (problemCells.size() > 0)
+        if (problemCells.size())
         {
             // This cycle has failed.  Print out the problem cells
             labelList toc(problemCells.toc());
diff --git a/src/meshTools/regionSplit/regionSplit.C b/src/meshTools/regionSplit/regionSplit.C
index b3152b44b2..667a2ddc5d 100644
--- a/src/meshTools/regionSplit/regionSplit.C
+++ b/src/meshTools/regionSplit/regionSplit.C
@@ -131,7 +131,7 @@ void Foam::regionSplit::fillSeedMask
 
     // Loop over changed faces. MeshWave in small.
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         //if (debug)
         //{
@@ -265,7 +265,7 @@ Foam::label Foam::regionSplit::calcRegionSplit
 {
     if (debug)
     {
-        if (blockedFace.size() > 0)
+        if (blockedFace.size())
         {
             // Check that blockedFace is synced.
             boolList syncBlockedFace(blockedFace);
@@ -292,7 +292,7 @@ Foam::label Foam::regionSplit::calcRegionSplit
     // -2 blocked
     labelList faceRegion(mesh_.nFaces(), -1);
 
-    if (blockedFace.size() > 0)
+    if (blockedFace.size())
     {
         forAll(blockedFace, faceI)
         {
diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C
index 49e7ed65eb..cb9ca7e442 100644
--- a/src/meshTools/searchableSurface/searchableBox.C
+++ b/src/meshTools/searchableSurface/searchableBox.C
@@ -194,7 +194,7 @@ Foam::searchableBox::~searchableBox()
 
 const Foam::wordList& Foam::searchableBox::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C
index e737c1cfa5..8d61564287 100644
--- a/src/meshTools/searchableSurface/searchablePlate.C
+++ b/src/meshTools/searchableSurface/searchablePlate.C
@@ -244,7 +244,7 @@ Foam::searchablePlate::~searchablePlate()
 
 const Foam::wordList& Foam::searchablePlate::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchableSphere.C b/src/meshTools/searchableSurface/searchableSphere.C
index 9b2b93ffb4..ba5a1888cf 100644
--- a/src/meshTools/searchableSurface/searchableSphere.C
+++ b/src/meshTools/searchableSurface/searchableSphere.C
@@ -151,7 +151,7 @@ Foam::searchableSphere::~searchableSphere()
 
 const Foam::wordList& Foam::searchableSphere::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(1);
         regions_[0] = "region0";
diff --git a/src/meshTools/searchableSurface/searchableSurfacesQueries.C b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
index 51e0b43259..7b8ef5c685 100644
--- a/src/meshTools/searchableSurface/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurface/searchableSurfacesQueries.C
@@ -482,7 +482,7 @@ void Foam::searchableSurfacesQueries::findAllIntersections
     hitSurfaces.setSize(start.size());
     hitInfo.setSize(start.size());
 
-    if (surfacesToTest.size() == 0)
+    if (surfacesToTest.empty())
     {
         return;
     }
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index 6803fb4def..ad8ffc5927 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -298,7 +298,7 @@ const Foam::indexedOctree<Foam::treeDataEdge>&
 
 const Foam::wordList& Foam::triSurfaceMesh::regions() const
 {
-    if (regions_.size() == 0)
+    if (regions_.empty())
     {
         regions_.setSize(patches().size());
         forAll(regions_, regionI)
diff --git a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
index 77fa2046f2..a2ef93da4b 100644
--- a/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
+++ b/src/meshTools/sets/pointSources/nearestToPoint/nearestToPoint.C
@@ -62,7 +62,7 @@ void Foam::nearestToPoint::combine(topoSet& set, const bool add) const
     {
         const pointField& pts = mesh_.points();
 
-        if (pts.size() > 0)
+        if (pts.size())
         {
             label minPointI = 0;
             scalar minDistSqr = magSqr(pts[minPointI] - points_[pointI]);
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
index daa59aad0d..8d73f64d51 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
@@ -181,7 +181,7 @@ Foam::edgeSurface::edgeSurface
         // Store current top of allEdges.
         label freeNewEdgeI = allEdges.size();
 
-        if (extraVerts.size() == 0)
+        if (extraVerts.empty())
         {
             // No cuts across this edge. Note that vertices do not need to be
             // renumbered.
diff --git a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
index 21a1227dc5..eadfeb7c4b 100644
--- a/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
+++ b/src/meshTools/triSurface/booleanOps/intersectedSurface/intersectedSurface.C
@@ -341,7 +341,7 @@ Foam::intersectedSurface::calcPointEdgeAddressing
         iter().shrink();
 
         // Check on dangling points.
-        if (iter().size() < 1)
+        if (iter().empty())
         {
             FatalErrorIn
             (
@@ -1171,7 +1171,7 @@ Foam::intersectedSurface::intersectedSurface
     faceMap_(0),
     nSurfacePoints_(surf.nPoints())
 {
-    if ((inter.cutPoints().size() == 0) && (inter.cutEdges().size() == 0))
+    if (inter.cutPoints().empty() && inter.cutEdges().empty())
     {
         // No intersection. Make straight copy.
         triSurface::operator=(surf);
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 42cbef8dab..f3ee58ed0b 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -255,7 +255,7 @@ bool Foam::edgeIntersections::inlinePerturb
 
     const labelList& edgeEnds = classification_[edgeI];
 
-    if (edgeEnds.size() > 0)
+    if (edgeEnds.size())
     {
         bool perturbStart = false;
         bool perturbEnd = false;
@@ -701,7 +701,7 @@ Foam::label Foam::edgeIntersections::removeDegenerates
         // Transfer and test.
         edgesToTest.transfer(newEdgesToTest);
 
-        if (edgesToTest.size() == 0)
+        if (edgesToTest.empty())
         {
             FatalErrorIn("perturb") << "oops" << abort(FatalError);
         }
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index af3d5e7e19..da78384e5c 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -1044,7 +1044,7 @@ Foam::surfaceIntersection::surfaceIntersection
     transfer(allCutPoints, cutPoints_);
 
     // Shortcut. 
-    if ((cutPoints_.size() == 0) && (cutEdges_.size() == 0))
+    if (cutPoints_.empty() && cutEdges_.empty())
     {
         if (debug)
         {
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 258e579fde..711ede3cd2 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -291,7 +291,7 @@ void Foam::surfaceIntersection::writeIntersectedEdges
     {
         const labelList& extraVerts = edgeCutVerts[edgeI];
 
-        if (extraVerts.size() != 0)
+        if (extraVerts.size())
         {
             const edge& e = surf.edges()[edgeI];
 
diff --git a/src/meshTools/triSurface/orientedSurface/orientedSurface.C b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
index 4cbbf0461f..911d06747a 100644
--- a/src/meshTools/triSurface/orientedSurface/orientedSurface.C
+++ b/src/meshTools/triSurface/orientedSurface/orientedSurface.C
@@ -245,7 +245,7 @@ void Foam::orientedSurface::propagateOrientation
                 << endl;
         }
 
-        if (changedEdges.size() == 0)
+        if (changedEdges.empty())
         {
             break;
         }
@@ -259,7 +259,7 @@ void Foam::orientedSurface::propagateOrientation
                 << endl;
         }
 
-        if (changedFaces.size() == 0)
+        if (changedFaces.empty())
         {
             break;
         }
diff --git a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
index aec5c87fb0..c5c0e3d4da 100644
--- a/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
+++ b/src/meshTools/twoDPointCorrector/twoDPointCorrector.C
@@ -84,11 +84,7 @@ void twoDPointCorrector::calcAddressing() const
     {
         forAll (patches, patchI)
         {
-            if
-            (
-                isA<emptyPolyPatch>(patches[patchI])
-             && patches[patchI].size() > 0
-            )
+            if (isA<emptyPolyPatch>(patches[patchI]) && patches[patchI].size())
             {
                 pn = patches[patchI].faceAreas()[0];
 
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index dbd86ca011..b7e31ef906 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -159,7 +159,7 @@ public:
         //- Return true or false to question: have any cells been cut?
         bool cut() const
         {
-            return (cutCells_.size() != 0);
+            return cutCells_.size();
         }
 
         //- Sample the cell field
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 3a0975662c..8233d24ea5 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -160,7 +160,7 @@ void meshToMesh::calcAddressing()
                 fromMeshPatches_.find(patchMap_.find(toPatch.name())())()
             ];
 
-            if (fromPatch.size() == 0)
+            if (fromPatch.empty())
             {
                 WarningIn("meshToMesh::calcAddressing()")
                     << "Source patch " << fromPatch.name()
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
index f14bd41fef..0133dee52b 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshWeights.C
@@ -70,7 +70,7 @@ void meshToMesh::calculateInverseDistanceWeights() const
             if
             (
                 m < directHitTol                            // Direct hit
-             || neighbours.size() == 0
+             || neighbours.empty()
             )
             {
                 invDistCoeffs[celli].setSize(1);
diff --git a/src/sampling/probes/probes.C b/src/sampling/probes/probes.C
index a1cca58b0a..f0596ea563 100644
--- a/src/sampling/probes/probes.C
+++ b/src/sampling/probes/probes.C
@@ -41,7 +41,7 @@ namespace Foam
 
 void Foam::probes::findCells(const fvMesh& mesh)
 {
-    if (cellList_.size() == 0)
+    if (cellList_.empty())
     {
         cellList_.setSize(probeLocations_.size());
 
diff --git a/src/sampling/sampledSet/cloud/cloudSet.C b/src/sampling/sampledSet/cloud/cloudSet.C
index b0b1f3f886..bc82887ee4 100644
--- a/src/sampling/sampledSet/cloud/cloudSet.C
+++ b/src/sampling/sampledSet/cloud/cloudSet.C
@@ -156,7 +156,7 @@ Foam::cloudSet::~cloudSet()
 
 Foam::point Foam::cloudSet::getRefPoint(const List<point>& pts) const
 {
-    if (pts.size() > 0)
+    if (pts.size())
     {
         // Use first samplePt as starting point
         return pts[0];
diff --git a/src/sampling/sampledSet/curve/curveSet.C b/src/sampling/sampledSet/curve/curveSet.C
index 1ef624c8d2..7b0a0b8e03 100644
--- a/src/sampling/sampledSet/curve/curveSet.C
+++ b/src/sampling/sampledSet/curve/curveSet.C
@@ -184,17 +184,16 @@ void Foam::curveSet::calcSamples
 
 
             // Get all boundary intersections
-            List<pointIndexHit> bHits =
-                searchEngine().intersections
-                (
-                    sampleCoords_[sampleI],
-                    sampleCoords_[sampleI+1]
-                );
+            List<pointIndexHit> bHits = searchEngine().intersections
+            (
+                sampleCoords_[sampleI],
+                sampleCoords_[sampleI+1]
+            );
 
             point bPoint(GREAT, GREAT, GREAT);
             label bFaceI = -1;
 
-            if (bHits.size() > 0)
+            if (bHits.size())
             {
                 bPoint = bHits[0].hitPoint();
                 bFaceI = bHits[0].index();
@@ -400,7 +399,7 @@ Foam::curveSet::~curveSet()
 
 Foam::point Foam::curveSet::getRefPoint(const List<point>& pts) const
 {
-    if (pts.size() > 0)
+    if (pts.size())
     {
         // Use first samplePt as starting point
         return pts[0];
diff --git a/src/sampling/sampledSet/face/faceOnlySet.C b/src/sampling/sampledSet/face/faceOnlySet.C
index 09c41d36d0..fba774f802 100644
--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@@ -121,17 +121,16 @@ void Foam::faceOnlySet::calcSamples
 
 
     // Get all boundary intersections
-    List<pointIndexHit> bHits =
-        searchEngine().intersections
-        (
-            start_ - smallVec,
-            end_ + smallVec
-        );
+    List<pointIndexHit> bHits = searchEngine().intersections
+    (
+        start_ - smallVec,
+        end_ + smallVec
+    );
 
     point bPoint(GREAT, GREAT, GREAT);
     label bFaceI = -1;
 
-    if (bHits.size() > 0)
+    if (bHits.size())
     {
         bPoint = bHits[0].hitPoint();
         bFaceI = bHits[0].index();
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index 52374b19c8..f09a82e30a 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -195,7 +195,7 @@ void Foam::sampledSets::combineSampledSets
         // Get reference point (note: only master has all points)
         point refPt;
 
-        if (allPts.size() > 0)
+        if (allPts.size())
         {
             refPt = samplePts.getRefPoint(allPts);
         }
diff --git a/src/sampling/sampledSet/uniform/uniformSet.C b/src/sampling/sampledSet/uniform/uniformSet.C
index 99bde6fb13..9b25ba4234 100644
--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@@ -238,17 +238,16 @@ void Foam::uniformSet::calcSamples
     const scalar smallDist = mag(smallVec);
 
     // Get all boundary intersections
-    List<pointIndexHit> bHits =
-        searchEngine().intersections
-        (
-            start_ - smallVec,
-            end_ + smallVec
-        );
+    List<pointIndexHit> bHits = searchEngine().intersections
+    (
+        start_ - smallVec,
+        end_ + smallVec
+    );
 
     point bPoint(GREAT, GREAT, GREAT);
     label bFaceI = -1;
 
-    if (bHits.size() > 0)
+    if (bHits.size())
     {
         bPoint = bHits[0].hitPoint();
         bFaceI = bHits[0].index();
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.C b/src/sampling/sampledSurface/isoSurface/isoSurface.C
index 98cc2e12d9..8522dd8442 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.C
@@ -274,9 +274,7 @@ Foam::pointIndexHit Foam::isoSurface::collapseSurface
 {
     pointIndexHit info(false, vector::zero, localTris.size());
 
-    if (localTris.size() == 0)
-    {}
-    else if (localTris.size() == 1)
+    if (localTris.size() == 1)
     {
         const labelledTri& tri = localTris[0];
         info.setPoint(tri.centre(localPoints));
@@ -303,7 +301,7 @@ Foam::pointIndexHit Foam::isoSurface::collapseSurface
             info.setHit();
         }
     }
-    else
+    else if (localTris.size())
     {
         // Check if single region. Rare situation.
         triSurface surf
@@ -1071,7 +1069,7 @@ void Foam::isoSurface::walkOrientation
 
     changedFaces.append(seedTriI);
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         DynamicList<label> newChangedFaces(changedFaces.size());
 
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
index b34e472787..52398eafa4 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
@@ -289,9 +289,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
 {
     pointIndexHit info(false, vector::zero, localTris.size());
 
-    if (localTris.size() == 0)
-    {}
-    else if (localTris.size() == 1)
+    if (localTris.size() == 1)
     {
         const labelledTri& tri = localTris[0];
         info.setPoint(tri.centre(localPoints));
@@ -318,7 +316,7 @@ Foam::pointIndexHit Foam::isoSurfaceCell::collapseSurface
             info.setHit();
         }
     }
-    else
+    else if (localTris.size())
     {
         // Check if single region. Rare situation.
         triSurface surf
@@ -404,11 +402,7 @@ void Foam::isoSurfaceCell::calcSnappedCc
                 }
             }
 
-            if (localPoints.size() == 0)
-            {
-                // No near intersections
-            }
-            else if (localPoints.size() == 1)
+            if (localPoints.size() == 1)
             {
                 // No need for any analysis.
                 snappedCc[cellI] = snappedPoints.size();
@@ -432,7 +426,7 @@ void Foam::isoSurfaceCell::calcSnappedCc
                 //    << " intersections down to "
                 //    << snappedPoints[snappedCc[cellI]] << endl;
             }
-            else
+            else if (localPoints.size())
             {
                 // Need to analyse
                 forAll(cFaces, cFaceI)
@@ -719,11 +713,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             }
         }
 
-        if (localTriPoints.size() == 0)
-        {
-            // No near intersections
-        }
-        else if (localTriPoints.size() == 3)
+        if (localTriPoints.size() == 3)
         {
             // Single triangle. No need for any analysis. Average points.
             pointField points;
@@ -734,7 +724,7 @@ void Foam::isoSurfaceCell::calcSnappedPoint
             //    << " replacing coord:" << mesh_.points()[pointI]
             //    << " by average:" << collapsedPoint[pointI] << endl;
         }
-        else
+        else if (localTriPoints.size())
         {
             // Convert points into triSurface.
 
@@ -1124,7 +1114,7 @@ void Foam::isoSurfaceCell::walkOrientation
 
     changedFaces.append(seedTriI);
 
-    while (changedFaces.size() > 0)
+    while (changedFaces.size())
     {
         DynamicList<label> newChangedFaces(changedFaces.size());
 
@@ -1636,7 +1626,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
 //// ones so limited benefit (e.g. 60 v.s. 88 triangles)
 //void Foam::isoSurfaceCell::combineCellTriangles()
 //{
-//    if (size() > 0)
+//    if (size())
 //    {
 //        DynamicList<labelledTri> newTris(size());
 //        DynamicList<label> newTriToCell(size());
diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
index c3dc6490a8..3aff356cef 100644
--- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C
@@ -29,7 +29,7 @@ License
 template<class Type>
 bool Foam::sampledSurface::checkFieldSize(const Field<Type>& field) const
 {
-    if (faces().size() == 0 || field.size() == 0)
+    if (faces().empty() || field.empty())
     {
         return false;
     }
diff --git a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
index 1df3b917d1..73cdeb6b11 100644
--- a/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
+++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C
@@ -438,7 +438,7 @@ Foam::label Foam::BasicMeshedSurface<Face>::triangulate
     // remember the number of *additional* faces
     nTri -= faceLst.size();
 
-    if (this->points().size() == 0)
+    if (this->points().empty())
     {
         // triangulate without points
         // simple face triangulation around f[0]
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index c260f5765b..7c0dc9cdcd 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -423,13 +423,13 @@ template<class Face>
 void Foam::MeshedSurface<Face>::onePatch(const word& name)
 {
     word patchName(name);
-    if (!patchName.size())
+    if (patchName.empty())
     {
-        if (patches_.size() >= 1)
+        if (patches_.size())
         {
             patchName = patches_[0].name();
         }
-        if (!patchName.size())
+        if (patchName.empty())
         {
             patchName = "patch0";
         }
@@ -537,7 +537,7 @@ void Foam::MeshedSurface<Face>::remapFaces
     // recalculate the patch start/size
     if (&faceMap && faceMap.size())
     {
-        if (patches_.size() == 0)
+        if (patches_.empty())
         {
             onePatch();
         }
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 7cd2c6d1ba..cb1997c225 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -307,13 +307,13 @@ void Foam::UnsortedMeshedSurface<Face>::onePatch(const word& name)
     regions_ = 0;
 
     word patchName(name);
-    if (!patchName.size())
+    if (patchName.empty())
     {
-        if (patches_.size() >= 1)
+        if (patches_.size())
         {
             patchName = patches_[0].name();
         }
-        if (!patchName.size())
+        if (patchName.empty())
         {
             patchName = "patch0";
         }
@@ -404,7 +404,7 @@ void Foam::UnsortedMeshedSurface<Face>::remapFaces
     // re-assign the region Ids
     if (&faceMap && faceMap.size())
     {
-        if (patches_.size() == 0)
+        if (patches_.empty())
         {
             onePatch();
         }
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index d195443acf..2c214162d0 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -169,7 +169,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
 
         // Skip empty or comment
-        if (line.size() == 0 || line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
             continue;
         }
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index 9c5ccd80a1..4201e1d888 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -56,7 +56,7 @@ Foam::fileFormats::surfaceFormatsCore::getLineNoComment
     {
         is.getLine(line);
     }
-    while ((line.size() == 0 || line[0] == '#') && is.good());
+    while ((line.empty() || line[0] == '#') && is.good());
 
     return line;
 }
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
index f403ae4496..d32e172dae 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -863,7 +863,7 @@ bool finishReaction = false;
             {
                 case unimolecularFallOffReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "LOW keyword given for a unimolecular fall-off"
@@ -898,7 +898,7 @@ bool finishReaction = false;
 
                 case chemicallyActivatedBimolecularReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "HIGH keyword given for a chemically"
@@ -935,7 +935,7 @@ bool finishReaction = false;
 
                 case TroeReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "TROE keyword given for a"
@@ -969,7 +969,7 @@ bool finishReaction = false;
 
                 case SRIReactionType:
                 {
-                    if (!pDependentSpecieName.size())
+                    if (pDependentSpecieName.empty())
                     {
                         FatalErrorIn("chemkinReader::lex()")
                             << "SRI keyword given for a"
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index 1871007784..bef2864e3e 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -49,10 +49,10 @@ void Foam::linearValveFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void linearValveFvMesh::addZonesAndModifiers() : "
@@ -235,7 +235,7 @@ bool Foam::linearValveFvMesh::attached() const
         {
             if
             (
-                result 
+                result
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index fc4a96ec9a..9dd4c56c2f 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -51,10 +51,10 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void linearValveLayersFvMesh::addZonesAndModifiers() : "
@@ -287,7 +287,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
         {
             if
             (
-                result 
+                result
              != refCast<const slidingInterface>(topoChanges[modI]).attached()
             )
             {
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 1fc143ff75..2e42a81c0f 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -49,10 +49,10 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void mixerFvMesh::addZonesAndModifiers() : "
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index 42e603e677..2ebc9f7ff0 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -88,10 +88,10 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
 
     if
     (
-        pointZones().size() > 0
-     || faceZones().size() > 0
-     || cellZones().size() > 0
-     || topoChanger_.size() > 0
+        pointZones().size()
+     || faceZones().size()
+     || cellZones().size()
+     || topoChanger_.size()
     )
     {
         Info<< "void movingConeTopoFvMesh::addZonesAndModifiers() : "
@@ -133,7 +133,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
                 << flipZone1[nZoneFaces1] << endl;
             nZoneFaces1++;
         }
-        else if 
+        else if
         (
             fc[faceI].x() > -0.00701
          && fc[faceI].x() < -0.00699
@@ -326,7 +326,7 @@ bool Foam::movingConeTopoFvMesh::update()
 
     vector curMotionVel_ =
         motionVelAmplitude_*
-        Foam::sin(time().value()*M_PI/motionVelPeriod_); 
+        Foam::sin(time().value()*M_PI/motionVelPeriod_);
 
     Pout<< "time:" << time().value() << " curMotionVel_:" << curMotionVel_
         << " curLeft:" << curLeft_ << " curRight:" << curRight_
diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/triSurface/meshTriangulation/meshTriangulation.C
index 134c5d7f7a..49066b804d 100644
--- a/src/triSurface/meshTriangulation/meshTriangulation.C
+++ b/src/triSurface/meshTriangulation/meshTriangulation.C
@@ -364,7 +364,7 @@ Foam::meshTriangulation::meshTriangulation
                 // Triangulate face. Fall back to naive triangulation if failed.
                 faceTriangulation faceTris(points, faces[faceI], true);
 
-                if (faceTris.size() == 0)
+                if (faceTris.empty())
                 {
                     WarningIn("meshTriangulation::meshTriangulation")
                         << "Could not find triangulation for face " << faceI
@@ -427,7 +427,7 @@ Foam::meshTriangulation::meshTriangulation
                 // Triangulate face
                 faceTriangulation faceTris(points, faces[faceI], true);
 
-                if (faceTris.size() == 0)
+                if (faceTris.empty())
                 {
                     WarningIn("meshTriangulation::meshTriangulation")
                         << "Could not find triangulation for face " << faceI
diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
index dd49ad72d1..1154d64c56 100644
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
@@ -60,7 +60,7 @@ geometricSurfacePatch::geometricSurfacePatch
     boundaryIndex_(index)
 
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
@@ -74,7 +74,7 @@ geometricSurfacePatch::geometricSurfacePatch(Istream& is, const label index)
     name_(is),
     boundaryIndex_(index)
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
@@ -93,7 +93,7 @@ geometricSurfacePatch::geometricSurfacePatch
     name_(name),
     boundaryIndex_(index)
 {
-    if (geometricType_.size() == 0)
+    if (geometricType_.empty())
     {
         geometricType_ = "empty";
     }
diff --git a/src/triSurface/triSurface/interfaces/NAS/readNAS.C b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
index 393484e87b..13b6a7573c 100644
--- a/src/triSurface/triSurface/interfaces/NAS/readNAS.C
+++ b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
@@ -169,7 +169,7 @@ bool triSurface::readNAS(const fileName& fName)
         }
 
 
-        if (line.size() == 0 || line[0] == '$')
+        if (line.empty() || line[0] == '$')
         {
             // Skip empty or comment
             continue;
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index bd78acff15..c0452e46aa 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -67,7 +67,7 @@ bool triSurface::readTRI(const fileName& TRIfileName)
     {
         string line = getLineNoComment(TRIfile);
 
-        if (line.size() == 0)
+        if (line.empty())
         {
             break;
         }
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index ff56e2ce4e..9ec6de95f5 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -178,7 +178,7 @@ Foam::string Foam::triSurface::getLineNoComment(IFstream& is)
     {
         is.getLine(line);
     }
-    while((line.size() == 0 || line[0] == '#') && is.good());
+    while ((line.empty() || line[0] == '#') && is.good());
 
     return line;
 }
@@ -327,7 +327,7 @@ void Foam::triSurface::checkEdges(const bool verbose)
     {
         const labelList& myFaces = eFaces[edgeI];
 
-        if (myFaces.size() == 0)
+        if (myFaces.empty())
         {
             FatalErrorIn("triSurface::checkEdges(bool verbose)")
                 << "Edge " << edgeI << " with vertices " << edges()[edgeI]
@@ -638,7 +638,7 @@ Foam::surfacePatchList Foam::triSurface::calcPatches(labelList& faceMap) const
     // Extend regions
     label maxRegion = patches_.size()-1;    // for non-compacted regions
 
-    if (faceMap.size() > 0)
+    if (faceMap.size())
     {
         maxRegion = max
         (
@@ -1007,7 +1007,7 @@ void Foam::triSurface::markZone
             }
         }
 
-        if (newChangedFaces.size() == 0)
+        if (newChangedFaces.empty())
         {
             break;
         }