From 841b65536baf6339a8b20b52b834b7abed9335de Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 13 May 2020 12:12:24 +0200
Subject: [PATCH] ENH: use unique_ptr for resource handling in dynamicMesh

ENH: defaulting for destructors where possible

STYLE: clear() instead of setSize(0) for plain Lists

STYLE: use bool operator instead of valid()/empty() for autoPtr tests
---
 src/dynamicMesh/attachDetach/attachDetach.C   |  31 +---
 src/dynamicMesh/attachDetach/attachDetach.H   |  11 +-
 .../attachDetach/attachDetachPointMatchMap.C  |   5 +-
 src/dynamicMesh/boundaryMesh/boundaryMesh.C   |  65 +++----
 src/dynamicMesh/boundaryMesh/boundaryMesh.H   |  11 +-
 .../createShellMesh/createShellMesh.H         |   7 +-
 src/dynamicMesh/fvMeshAdder/fvMeshAdder.H     |   3 +-
 .../fvMeshDistribute/fvMeshDistribute.C       |   1 -
 .../fvMeshDistribute/fvMeshDistribute.H       |   4 +-
 src/dynamicMesh/fvMeshSubset/fvMeshSubset.C   |   9 +-
 src/dynamicMesh/fvMeshSubset/fvMeshSubsetI.H  |   8 +-
 .../fvMeshSubsetProxy/fvMeshSubsetProxy.H     |   7 +-
 .../layerAdditionRemoval.C                    |  45 +----
 .../layerAdditionRemoval.H                    |  19 +-
 .../layerAdditionRemoval/setLayerPairing.C    |  18 +-
 src/dynamicMesh/meshCut/cellCuts/cellCuts.C   |  36 ++--
 src/dynamicMesh/meshCut/cellCuts/cellCuts.H   |  13 +-
 .../meshCut/cellLooper/cellLooper.C           |   6 -
 .../meshCut/cellLooper/cellLooper.H           |  15 +-
 .../meshCut/cellLooper/geomCellLooper.C       |  29 +--
 .../meshCut/cellLooper/geomCellLooper.H       |  14 +-
 .../meshCut/cellLooper/hexCellLooper.C        |  12 +-
 .../meshCut/cellLooper/hexCellLooper.H        |  11 +-
 .../meshCut/cellLooper/topoCellLooper.C       |   8 -
 .../meshCut/cellLooper/topoCellLooper.H       |  10 +-
 .../meshCut/directions/directions.H           |   6 +-
 .../meshCut/edgeVertex/edgeVertex.C           |   1 -
 .../meshCut/edgeVertex/edgeVertex.H           |   7 +-
 .../boundaryCutter/boundaryCutter.C           |   7 -
 .../boundaryCutter/boundaryCutter.H           |   7 +-
 .../meshCutAndRemove/meshCutAndRemove.C       |   1 -
 .../meshCutAndRemove/meshCutAndRemove.H       |  17 +-
 .../meshModifiers/meshCutter/meshCutter.C     |   6 -
 .../meshModifiers/meshCutter/meshCutter.H     |   7 +-
 .../multiDirRefinement/multiDirRefinement.H   |   2 +-
 .../refinementIterator/refinementIterator.C   |   3 +-
 .../refinementIterator/refinementIterator.H   |   5 +-
 .../undoableMeshCutter/undoableMeshCutter.C   |   1 -
 .../undoableMeshCutter/undoableMeshCutter.H   |  15 +-
 .../meshCut/refineCell/refineCell.H           |  21 ++-
 src/dynamicMesh/meshCut/splitCell/splitCell.C |   1 -
 src/dynamicMesh/meshCut/splitCell/splitCell.H |  12 +-
 .../polyMeshGeometry/polyMeshGeometry.C       |   1 -
 .../polyMeshGeometry/polyMeshGeometry.H       |   3 +-
 .../codedPoints0/codedPoints0MotionSolver.C   |  13 +-
 .../codedPoints0/codedPoints0MotionSolver.H   |   4 +-
 .../displacement/displacement/zoneMotion.C    |   7 +-
 .../displacement/displacement/zoneMotion.H    |   7 +-
 .../displacementInterpolationMotionSolver.C   |   7 -
 .../displacementInterpolationMotionSolver.H   |   6 +-
 ...yMotionDisplacementPointPatchVectorField.C |  19 +-
 ...yMotionDisplacementPointPatchVectorField.H |   6 +-
 .../solidBodyMotionFunctions/SDA/SDA.C        |   6 -
 .../solidBodyMotionFunctions/SDA/SDA.H        |   5 +-
 .../axisRotationMotion/axisRotationMotion.C   |   6 -
 .../axisRotationMotion/axisRotationMotion.H   |   5 +-
 .../drivenLinearMotion/drivenLinearMotion.C   |   6 -
 .../drivenLinearMotion/drivenLinearMotion.H   |   2 +-
 .../linearMotion/linearMotion.C               |   6 -
 .../linearMotion/linearMotion.H               |   4 +-
 .../multiMotion/multiMotion.C                 |   6 -
 .../multiMotion/multiMotion.H                 |   4 +-
 .../oscillatingLinearMotion.C                 |   7 -
 .../oscillatingLinearMotion.H                 |   5 +-
 .../oscillatingRotatingMotion.C               |   7 -
 .../oscillatingRotatingMotion.H               |   5 +-
 .../rotatingMotion/rotatingMotion.C           |  11 +-
 .../rotatingMotion/rotatingMotion.H           |   5 +-
 .../solidBodyMotionFunction.C                 |   6 -
 .../solidBodyMotionFunction.H                 |  12 +-
 .../tabulated6DoFMotion/tabulated6DoFMotion.C |   6 -
 .../tabulated6DoFMotion/tabulated6DoFMotion.H |   3 +-
 .../motionSolvers/motionSolver/motionSolver.C |   6 -
 .../motionSolvers/motionSolver/motionSolver.H |   6 +-
 .../velocity/velocityMotionSolver.C           |   6 -
 .../velocity/velocityMotionSolver.H           |   9 +-
 .../perfectInterface/perfectInterface.C       |   6 -
 .../perfectInterface/perfectInterface.H       |  12 +-
 .../pointPatchDist/pointPatchDist.C           |   6 -
 .../pointPatchDist/pointPatchDist.H           |   5 +-
 .../polyMeshAdder/faceCoupleInfo.C            |   6 -
 .../polyMeshAdder/faceCoupleInfo.H            |  14 +-
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.H |   8 +-
 .../polyMeshFilter/polyMeshFilter.C           |   6 -
 .../polyMeshFilter/polyMeshFilter.H           |   3 +-
 .../polyMeshModifier/polyMeshModifier.C       |   8 -
 .../polyMeshModifier/polyMeshModifier.H       |   8 +-
 .../polyTopoChange/addPatchCellLayer.H        |   8 +-
 .../polyTopoChange/combineFaces.H             |   8 +-
 .../polyTopoChange/duplicatePoints.C          |   1 -
 .../polyTopoChange/duplicatePoints.H          |   4 +-
 .../polyTopoChange/edgeCollapser.H            |   4 +-
 .../polyTopoChange/faceCollapser.H            |   7 +-
 .../polyTopoChange/hexRef8/hexRef8.C          |   6 +-
 .../polyTopoChange/hexRef8/hexRef8.H          |   9 +-
 .../polyTopoChange/hexRef8/hexRef8Data.C      | 169 +++++++-----------
 .../polyTopoChange/hexRef8/hexRef8Data.H      |  15 +-
 .../hexRef8/refinementHistory.C               |  93 +++++-----
 .../hexRef8/refinementHistory.H               |  48 +++--
 .../polyTopoChange/removeCells.H              |   2 +-
 .../polyTopoChange/removeFaces.H              |   3 +-
 .../polyTopoChange/removePoints.H             |  19 +-
 .../polyTopoChanger/polyTopoChanger.H         |  11 +-
 .../repatchPolyTopoChanger.C                  |  18 +-
 .../repatchPolyTopoChanger.H                  |   8 +-
 src/dynamicMesh/setUpdater/setUpdater.C       |   6 -
 src/dynamicMesh/setUpdater/setUpdater.H       |   3 +-
 .../slidingInterface/coupleSlidingInterface.C |   8 +-
 .../enrichedPatch/enrichedPatch.C             |  27 +--
 .../enrichedPatch/enrichedPatch.H             |  26 +--
 .../enrichedPatch/enrichedPatchCutFaces.C     |  18 +-
 .../enrichedPatch/enrichedPatchFaces.C        |   9 +-
 .../enrichedPatch/enrichedPatchMasterPoints.C |   7 +-
 .../enrichedPatch/enrichedPatchPointPoints.C  |   6 +-
 .../slidingInterface/slidingInterface.C       |  38 ++--
 .../slidingInterface/slidingInterface.H       |  37 ++--
 .../slidingInterfaceAttachedAddressing.C      |  94 +++++-----
 .../slidingInterfaceProjectPoints.C           | 119 ++++++------
 118 files changed, 655 insertions(+), 992 deletions(-)

diff --git a/src/dynamicMesh/attachDetach/attachDetach.C b/src/dynamicMesh/attachDetach/attachDetach.C
index b58659eb7b..1f0d9c6007 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.C
+++ b/src/dynamicMesh/attachDetach/attachDetach.C
@@ -33,7 +33,6 @@ License
 #include "primitiveMesh.H"
 #include "polyTopoChange.H"
 #include "addToRunTimeSelectionTable.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -222,13 +221,12 @@ void Foam::attachDetach::checkDefinition()
 
 void Foam::attachDetach::clearAddressing() const
 {
-    deleteDemandDrivenData(pointMatchMapPtr_);
+    pointMatchMapPtr_.reset(nullptr);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::attachDetach::attachDetach
 (
     const word& name,
@@ -256,7 +254,6 @@ Foam::attachDetach::attachDetach
 }
 
 
-// Construct from components
 Foam::attachDetach::attachDetach
 (
     const word& name,
@@ -292,26 +289,11 @@ Foam::attachDetach::attachDetach
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::attachDetach::~attachDetach()
-{
-    clearAddressing();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::attachDetach::setAttach() const
 {
-    if (!attached())
-    {
-        trigger_ = true;
-    }
-    else
-    {
-        trigger_ = false;
-    }
+    trigger_ = (!attached());
 
     return trigger_;
 }
@@ -319,14 +301,7 @@ bool Foam::attachDetach::setAttach() const
 
 bool Foam::attachDetach::setDetach() const
 {
-    if (attached())
-    {
-        trigger_ = true;
-    }
-    else
-    {
-        trigger_ = false;
-    }
+    trigger_ = (attached());
 
     return trigger_;
 }
diff --git a/src/dynamicMesh/attachDetach/attachDetach.H b/src/dynamicMesh/attachDetach/attachDetach.H
index a818ddb856..1056a4acac 100644
--- a/src/dynamicMesh/attachDetach/attachDetach.H
+++ b/src/dynamicMesh/attachDetach/attachDetach.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,7 +64,7 @@ class attachDetach
 :
     public polyMeshModifier
 {
-    // Data types
+    // Data Types
 
         //- State of the modifier
         enum modifierState
@@ -74,7 +75,7 @@ class attachDetach
         };
 
 
-    // Private data
+    // Private Data
 
         //- Master face zone ID
         faceZoneID faceZoneID_;
@@ -103,8 +104,8 @@ class attachDetach
 
         // Private addressing data.  Created on topology change
 
-            //- Map of matching points
-            mutable Map<label>* pointMatchMapPtr_;
+        //- Map of matching points
+        mutable unique_ptr<Map<label>> pointMatchMapPtr_;
 
 
     // Private Member Functions
@@ -174,7 +175,7 @@ public:
 
 
     //- Destructor
-    virtual ~attachDetach();
+    virtual ~attachDetach() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
index 258260b8d7..64f88bac9c 100644
--- a/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
+++ b/src/dynamicMesh/attachDetach/attachDetachPointMatchMap.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,8 +90,8 @@ void Foam::attachDetach::calcPointMatchMap() const
     const faceList& masterLocalFaces = masterPatch.localFaces();
     const faceList& slaveLocalFaces = reverseSlavePatch.localFaces();
 
-    pointMatchMapPtr_ = new Map<label>(2*slaveMeshPoints.size());
-    Map<label>& removedPointMap = *pointMatchMapPtr_;
+    pointMatchMapPtr_.reset(new Map<label>(2*slaveMeshPoints.size()));
+    auto& removedPointMap = *pointMatchMapPtr_;
 
     forAll(masterLocalFaces, facei)
     {
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.C b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
index 7df285f68a..7cfffd205d 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.C
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.C
@@ -43,14 +43,14 @@ License
 
 namespace Foam
 {
-defineTypeNameAndDebug(boundaryMesh, 0);
+    defineTypeNameAndDebug(boundaryMesh, 0);
+}
 
 // Normal along which to divide faces into categories (used in getNearest)
-const vector boundaryMesh::splitNormal_(3, 2, 1);
+const Foam::vector Foam::boundaryMesh::splitNormal_(3, 2, 1);
 
 // Distance to face tolerance for getNearest
-const scalar boundaryMesh::distanceTol_ = 1e-2;
-}
+const Foam::scalar Foam::boundaryMesh::distanceTol_ = 1e-2;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -437,7 +437,6 @@ void Foam::boundaryMesh::markZone
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Null constructor
 Foam::boundaryMesh::boundaryMesh()
 :
     meshPtr_(nullptr),
@@ -452,27 +451,14 @@ Foam::boundaryMesh::boundaryMesh()
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::boundaryMesh::~boundaryMesh()
-{
-    clearOut();
-}
-
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::boundaryMesh::clearOut()
 {
-    if (meshPtr_)
-    {
-        delete meshPtr_;
-
-        meshPtr_ = nullptr;
-    }
+    meshPtr_.reset(nullptr);
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 void Foam::boundaryMesh::read(const polyMesh& mesh)
 {
     patches_.clear();
@@ -544,8 +530,10 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
     // Store in local(compact) addressing
     clearOut();
 
-    meshPtr_ = new bMesh(globalPatch.localFaces(), globalPatch.localPoints());
-
+    meshPtr_.reset
+    (
+        new bMesh(globalPatch.localFaces(), globalPatch.localPoints())
+    );
 
     if (debug & 2)
     {
@@ -586,16 +574,15 @@ void Foam::boundaryMesh::read(const polyMesh& mesh)
     }
 
     // Clear edge storage
-    featurePoints_.setSize(0);
-    featureEdges_.setSize(0);
+    featurePoints_.clear();
+    featureEdges_.clear();
 
-    featureToEdge_.setSize(0);
-    edgeToFeature_.setSize(meshPtr_->nEdges());
+    featureToEdge_.clear();
+    edgeToFeature_.resize(meshPtr_->nEdges());
     edgeToFeature_ = -1;
 
-    featureSegments_.setSize(0);
-
-    extraEdges_.setSize(0);
+    featureSegments_.clear();
+    extraEdges_.clear();
 }
 
 
@@ -752,19 +739,18 @@ void Foam::boundaryMesh::readTriSurface(const fileName& fName)
     clearOut();
 
     // Store compact.
-    meshPtr_ = new bMesh(bFaces, surf.localPoints());
+    meshPtr_.reset(new bMesh(bFaces, surf.localPoints()));
 
     // Clear edge storage
-    featurePoints_.setSize(0);
-    featureEdges_.setSize(0);
+    featurePoints_.clear();
+    featureEdges_.clear();
 
-    featureToEdge_.setSize(0);
-    edgeToFeature_.setSize(meshPtr_->nEdges());
+    featureToEdge_.clear();
+    edgeToFeature_.resize(meshPtr_->nEdges());
     edgeToFeature_ = -1;
 
-    featureSegments_.setSize(0);
-
-    extraEdges_.setSize(0);
+    featureSegments_.clear();
+    extraEdges_.clear();
 }
 
 
@@ -1813,7 +1799,8 @@ void Foam::boundaryMesh::changeFaces
     }
 
     // Reconstruct 'mesh' from new faces and (copy of) existing points.
-    bMesh* newMeshPtr_ = new bMesh(newFaces, mesh().points());
+
+    unique_ptr<bMesh> newMeshPtr(new bMesh(newFaces, mesh().points()));
 
     // Reset meshFace_ to new ordering.
     meshFace_.transfer(newMeshFace);
@@ -1823,7 +1810,7 @@ void Foam::boundaryMesh::changeFaces
     clearOut();
 
     // And insert new 'mesh'.
-    meshPtr_ = newMeshPtr_;
+    meshPtr_ = std::move(newMeshPtr);
 }
 
 
diff --git a/src/dynamicMesh/boundaryMesh/boundaryMesh.H b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
index c7602a7e9d..2e30f20c31 100644
--- a/src/dynamicMesh/boundaryMesh/boundaryMesh.H
+++ b/src/dynamicMesh/boundaryMesh/boundaryMesh.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,7 +77,7 @@ class boundaryMesh
     // Private Data
 
         //- All boundary mesh data. Reconstructed every time faces are repatched
-        bMesh* meshPtr_;
+        unique_ptr<bMesh> meshPtr_;
 
         //- Patches. Reconstructed every time faces are repatched.
         PtrList<boundaryPatch> patches_;
@@ -189,12 +190,12 @@ public:
 
     // Constructors
 
-        //- Construct null
+        //- Default construct
         boundaryMesh();
 
 
     //- Destructor
-    ~boundaryMesh();
+    ~boundaryMesh() = default;
 
         void clearOut();
 
@@ -208,8 +209,8 @@ public:
                 if (!meshPtr_)
                 {
                     FatalErrorInFunction
-                        << "No mesh available. Probably mesh not yet"
-                        << " read." << abort(FatalError);
+                        << "No mesh available. Probably mesh not yet read\n"
+                        << abort(FatalError);
                 }
                 return *meshPtr_;
             }
diff --git a/src/dynamicMesh/createShellMesh/createShellMesh.H b/src/dynamicMesh/createShellMesh/createShellMesh.H
index 1708325852..7a5cd13425 100644
--- a/src/dynamicMesh/createShellMesh/createShellMesh.H
+++ b/src/dynamicMesh/createShellMesh/createShellMesh.H
@@ -50,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class mapPolyMesh;
 class polyTopoChange;
 class globalMeshData;
@@ -61,7 +61,7 @@ class globalMeshData;
 
 class createShellMesh
 {
-    // Private data
+    // Private Data
 
         //- Reference to patch to extrude
         const primitiveFacePatch& patch_;
@@ -113,7 +113,7 @@ public:
 
     // Constructors
 
-        //- Construct from mesh.
+        //- Construct from face patch
         createShellMesh
         (
             const primitiveFacePatch& patch,
@@ -124,7 +124,6 @@ public:
 
     // Member Functions
 
-
         // Access
 
             //- From region cell to patch face. Consecutively added so
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index 851cdd70b4..0c10219b89 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -51,7 +51,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class IOobject;
 class faceCoupleInfo;
 class IOobjectList;
@@ -68,7 +68,6 @@ class fvMeshAdder
 :
     public polyMeshAdder
 {
-
 private:
 
     // Private Member Functions
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 3187a1f32d..65e12603ed 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -1650,7 +1650,6 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshDistribute::receiveMesh
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::fvMeshDistribute::fvMeshDistribute(fvMesh& mesh, const scalar mergeTol)
 :
     mesh_(mesh),
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index 9baf762c5a..edff18f8c5 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -63,7 +63,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class mapAddedPolyMesh;
 class mapDistributePolyMesh;
 
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 1444aa2d38..aa62bf48f3 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -68,7 +68,7 @@ Foam::word Foam::fvMeshSubset::exposedPatchName("oldInternalFaces");
 
 bool Foam::fvMeshSubset::checkCellSubset() const
 {
-    if (fvMeshSubsetPtr_.empty())
+    if (!fvMeshSubsetPtr_)
     {
         FatalErrorInFunction
             << "setCellSubset()" << nl
@@ -87,9 +87,8 @@ void Foam::fvMeshSubset::calcFaceFlipMap() const
     const labelList& subToBaseFace = faceMap();
     const labelList& subToBaseCell = cellMap();
 
-    faceFlipMapPtr_.clear();
     faceFlipMapPtr_.reset(new labelList(subToBaseFace.size()));
-    labelList& faceFlipMap = *faceFlipMapPtr_;
+    auto& faceFlipMap = *faceFlipMapPtr_;
 
     // Only exposed internal faces might be flipped (since we don't do
     // any cell renumbering, just compacting)
@@ -546,8 +545,8 @@ Foam::fvMeshSubset::fvMeshSubset
 
 void Foam::fvMeshSubset::clear()
 {
-    fvMeshSubsetPtr_.clear();
-    faceFlipMapPtr_.clear();
+    fvMeshSubsetPtr_.reset(nullptr);
+    faceFlipMapPtr_.reset(nullptr);
 
     pointMap_.clear();
     faceMap_.clear();
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetI.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetI.H
index 7a2ae745d1..434935c050 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetI.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetI.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -35,13 +35,13 @@ inline const Foam::fvMesh& Foam::fvMeshSubset::baseMesh() const
 
 inline const Foam::fvMesh& Foam::fvMeshSubset::mesh() const
 {
-    return fvMeshSubsetPtr_.valid() ? *fvMeshSubsetPtr_ : baseMesh_;
+    return fvMeshSubsetPtr_ ? *fvMeshSubsetPtr_ : baseMesh_;
 }
 
 
 inline bool Foam::fvMeshSubset::hasSubMesh() const
 {
-    return fvMeshSubsetPtr_.valid();
+    return bool(fvMeshSubsetPtr_);
 }
 
 
@@ -79,7 +79,7 @@ inline const Foam::labelList& Foam::fvMeshSubset::faceMap() const
 
 inline const Foam::labelList& Foam::fvMeshSubset::faceFlipMap() const
 {
-    if (!faceFlipMapPtr_.valid())
+    if (!faceFlipMapPtr_)
     {
         calcFaceFlipMap();
     }
diff --git a/src/dynamicMesh/fvMeshSubsetProxy/fvMeshSubsetProxy.H b/src/dynamicMesh/fvMeshSubsetProxy/fvMeshSubsetProxy.H
index 58639ad477..eaa1ebe02b 100644
--- a/src/dynamicMesh/fvMeshSubsetProxy/fvMeshSubsetProxy.H
+++ b/src/dynamicMesh/fvMeshSubsetProxy/fvMeshSubsetProxy.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,9 +49,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
-class Time;
-
 /*---------------------------------------------------------------------------*\
                       Class fvMeshSubsetProxy Declaration
 \*---------------------------------------------------------------------------*/
@@ -60,6 +57,8 @@ class fvMeshSubsetProxy
 {
 public:
 
+    // Data Types
+
         //- Internal bookkeeping for subset type
         enum subsetType
         {
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index a7d9b46b61..f727b600fa 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -33,7 +33,6 @@ License
 #include "primitiveMesh.H"
 #include "polyTopoChange.H"
 #include "addToRunTimeSelectionTable.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -96,38 +95,10 @@ void Foam::layerAdditionRemoval::checkDefinition()
 }
 
 
-Foam::scalar Foam::layerAdditionRemoval::readOldThickness
-(
-    const dictionary& dict
-)
-{
-    return dict.lookupOrDefault("oldLayerThickness", -1.0);
-}
-
-
 void Foam::layerAdditionRemoval::clearAddressing() const
 {
-    if (pointsPairingPtr_)
-    {
-        if (debug)
-        {
-            Pout<< "layerAdditionRemoval::clearAddressing()" << nl
-                << "    clearing pointsPairingPtr_" << endl;
-        }
-
-        deleteDemandDrivenData(pointsPairingPtr_);
-    }
-
-    if (facesPairingPtr_)
-    {
-        if (debug)
-        {
-            Pout<< "layerAdditionRemoval::clearAddressing()" << nl
-                << "    clearing facesPairingPtr_" << endl;
-        }
-
-        deleteDemandDrivenData(facesPairingPtr_);
-    }
+    pointsPairingPtr_.reset(nullptr);
+    facesPairingPtr_.reset(nullptr);
 }
 
 
@@ -171,8 +142,8 @@ Foam::layerAdditionRemoval::layerAdditionRemoval
     faceZoneID_(dict.lookup("faceZoneName"), ptc.mesh().faceZones()),
     minLayerThickness_(dict.get<scalar>("minLayerThickness")),
     maxLayerThickness_(dict.get<scalar>("maxLayerThickness")),
-    thicknessFromVolume_(dict.lookupOrDefault("thicknessFromVolume", true)),
-    oldLayerThickness_(readOldThickness(dict)),
+    thicknessFromVolume_(dict.getOrDefault("thicknessFromVolume", true)),
+    oldLayerThickness_(dict.getOrDefault<scalar>("oldLayerThickness", -1.0)),
     pointsPairingPtr_(nullptr),
     facesPairingPtr_(nullptr),
     triggerRemoval_(-1),
@@ -182,14 +153,6 @@ Foam::layerAdditionRemoval::layerAdditionRemoval
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::layerAdditionRemoval::~layerAdditionRemoval()
-{
-    clearAddressing();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::layerAdditionRemoval::changeTopology() const
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
index 0be1621e08..373d84ef80 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2013 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +57,7 @@ class layerAdditionRemoval
 :
     public polyMeshModifier
 {
-    // Private data
+    // Private Data
 
         //- Master face zone ID
         faceZoneID faceZoneID_;
@@ -76,10 +77,10 @@ class layerAdditionRemoval
         mutable scalar oldLayerThickness_;
 
         //- Point pairing
-        mutable labelList* pointsPairingPtr_;
+        mutable unique_ptr<labelList> pointsPairingPtr_;
 
         //- Face pairing
-        mutable labelList* facesPairingPtr_;
+        mutable unique_ptr<labelList> facesPairingPtr_;
 
         //- Layer removal trigger time index
         mutable label triggerRemoval_;
@@ -100,7 +101,7 @@ class layerAdditionRemoval
         void checkDefinition();
 
 
-        // Topological changes
+        // Topological Changes
 
             //- Check for valid layer
             bool validCollapse() const;
@@ -127,13 +128,7 @@ class layerAdditionRemoval
             void clearAddressing() const;
 
 
-        // Helpers
-
-            //- Optionally read old thickness
-            static scalar readOldThickness(const dictionary&);
-
-
-    // Static data members
+    // Static Data Members
 
         //- Thickness insertion fraction for the pre-motion
         static const scalar addDelta_;
@@ -174,7 +169,7 @@ public:
 
 
     //- Destructor
-    virtual ~layerAdditionRemoval();
+    virtual ~layerAdditionRemoval() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
index 079b3d715b..f65234f996 100644
--- a/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
+++ b/src/dynamicMesh/layerAdditionRemoval/setLayerPairing.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,11 +84,11 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
             << abort(FatalError);
     }
 
-    pointsPairingPtr_ = new labelList(meshPoints.size(), -1);
-    labelList& ptc = *pointsPairingPtr_;
+    pointsPairingPtr_.reset(new labelList(meshPoints.size(), -1));
+    facesPairingPtr_.reset(new labelList(mf.size(), -1));
 
-    facesPairingPtr_ = new labelList(mf.size(), -1);
-    labelList& ftc = *facesPairingPtr_;
+    auto& ptc = *pointsPairingPtr_;
+    auto& ftc = *facesPairingPtr_;
 
     if (debug > 1)
     {
@@ -177,11 +178,9 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
 
         return false;
     }
-    else
-    {
-        // Valid layer
-        return true;
-    }
+
+    // Valid layer
+    return true;
 }
 
 
@@ -197,6 +196,7 @@ const Foam::labelList& Foam::layerAdditionRemoval::pointsPairing() const
     return *pointsPairingPtr_;
 }
 
+
 const Foam::labelList& Foam::layerAdditionRemoval::facesPairing() const
 {
     if (!facesPairingPtr_)
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
index 3f1d37ddea..b3f3c15784 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -488,7 +488,7 @@ Foam::label Foam::cellCuts::vertexVertexToFace
 
 void Foam::cellCuts::calcFaceCuts() const
 {
-    if (faceCutsPtr_.valid())
+    if (faceCutsPtr_)
     {
         FatalErrorInFunction
             << "faceCuts already calculated" << abort(FatalError);
@@ -497,7 +497,7 @@ void Foam::cellCuts::calcFaceCuts() const
     const faceList& faces = mesh().faces();
 
     faceCutsPtr_.reset(new labelListList(mesh().nFaces()));
-    labelListList& faceCuts = faceCutsPtr_();
+    auto& faceCuts = *faceCutsPtr_;
 
     for (label facei = 0; facei < mesh().nFaces(); facei++)
     {
@@ -1275,7 +1275,7 @@ void Foam::cellCuts::calcCellLoops(const labelList& cutCells)
                     // Dump cell and cuts on cell.
                     writeUncutOBJ(".", celli);
                 }
-                cellLoops_[celli].setSize(0);
+                cellLoops_[celli].clear();
             }
         }
         else
@@ -1283,7 +1283,7 @@ void Foam::cellCuts::calcCellLoops(const labelList& cutCells)
             //Pout<< "calcCellLoops(const labelList&) : did not find valid"
             //    << " loop for cell " << celli << " since not enough cut faces"
             //    << endl;
-            cellLoops_[celli].setSize(0);
+            cellLoops_[celli].clear();
         }
     }
 }
@@ -2196,8 +2196,8 @@ void Foam::cellCuts::setFromCellLoops()
                         << endl;
                 }
 
-                cellLoops_[celli].setSize(0);
-                cellAnchorPoints_[celli].setSize(0);
+                cellLoops_[celli].clear();
+                cellAnchorPoints_[celli].clear();
             }
             else
             {
@@ -2368,7 +2368,7 @@ void Foam::cellCuts::setFromCellLoops
             else
             {
                 // Clear cellLoops
-                cellLoops_[celli].setSize(0);
+                cellLoops_[celli].clear();
             }
         }
     }
@@ -2430,7 +2430,7 @@ void Foam::cellCuts::setFromCellCutter
             }
             else
             {
-                cellLoops_[celli].setSize(0);
+                cellLoops_[celli].clear();
 
                 WarningInFunction
                     << "Found loop on cell " << celli
@@ -2455,7 +2455,7 @@ void Foam::cellCuts::setFromCellCutter
         else
         {
             // Clear cellLoops
-            cellLoops_[celli].setSize(0);
+            cellLoops_[celli].clear();
         }
     }
 
@@ -2552,7 +2552,7 @@ void Foam::cellCuts::setFromCellCutter
             }
             else
             {
-                cellLoops_[celli].setSize(0);
+                cellLoops_[celli].clear();
 
                 // Discarded by validLoop
                 if (debug)
@@ -2566,7 +2566,7 @@ void Foam::cellCuts::setFromCellCutter
         else
         {
             // Clear cellLoops
-            cellLoops_[celli].setSize(0);
+            cellLoops_[celli].clear();
         }
     }
 
@@ -3138,22 +3138,14 @@ Foam::cellCuts::cellCuts
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cellCuts::~cellCuts()
-{
-    clearOut();
-}
-
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::cellCuts::clearOut()
 {
-    faceCutsPtr_.clear();
+    faceCutsPtr_.reset(nullptr);
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 Foam::pointField Foam::cellCuts::loopPoints(const label celli) const
 {
     const labelList& loop = cellLoops_[celli];
diff --git a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
index cecc54f2c8..6b020fe730 100644
--- a/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
+++ b/src/dynamicMesh/meshCut/cellCuts/cellCuts.H
@@ -98,7 +98,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class cellLooper;
 class refineCell;
@@ -112,7 +112,7 @@ class cellCuts
 :
     public edgeVertex
 {
-    // Private data
+    // Private Data
 
         //- Warn for illegal cuts
         const bool verbose_;
@@ -134,7 +134,7 @@ class cellCuts
 
             //- Cuts per existing face (includes those along edge of face)
             //  Cuts in no particular order.
-            mutable autoPtr<labelListList> faceCutsPtr_;
+            mutable unique_ptr<labelListList> faceCutsPtr_;
 
             //- Per face : cut across edge (so not along existing edge)
             //  (can only be one per face)
@@ -184,6 +184,7 @@ class cellCuts
             const Map<label>&
         );
 
+
     // Private Member Functions
 
         //- Debugging: write cell's edges and any cut vertices and edges
@@ -541,9 +542,9 @@ public:
 
 
     //- Destructor
-    ~cellCuts();
+    ~cellCuts() = default;
 
-        //- Clear out demand driven storage
+        //- Clear out demand-driven storage
         void clearOut();
 
 
@@ -573,7 +574,7 @@ public:
             //  Cuts in no particular order
             const labelListList& faceCuts() const
             {
-                if (!faceCutsPtr_.valid())
+                if (!faceCutsPtr_)
                 {
                     calcFaceCuts();
                 }
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
index 1a3894f4aa..e96bd7d725 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.C
@@ -202,10 +202,4 @@ Foam::cellLooper::cellLooper(const polyMesh& mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cellLooper::~cellLooper()
-{}
-
-
 // ************************************************************************* //
diff --git a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
index b10e4f2f57..a04148069c 100644
--- a/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/cellLooper.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +62,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class plane;
 
@@ -73,7 +74,6 @@ class cellLooper
 :
     public edgeVertex
 {
-
 protected:
 
     // Protected Member Functions
@@ -106,10 +106,6 @@ protected:
         label getMisAlignedEdge(const vector& refDir, const label celli) const;
 
 
-private:
-
-    // Private Member Functions
-
         //- No copy construct
         cellLooper(const cellLooper&) = delete;
 
@@ -140,8 +136,8 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        cellLooper(const polyMesh& mesh);
+        //- Construct from mesh
+        explicit cellLooper(const polyMesh& mesh);
 
         //- Clone
         autoPtr<cellLooper> clone() const
@@ -162,7 +158,7 @@ public:
 
 
     //- Destructor
-    virtual ~cellLooper();
+    virtual ~cellLooper() = default;
 
 
     // Member Functions
@@ -198,7 +194,6 @@ public:
             labelList& loop,
             scalarField& loopWeights
         ) const = 0;
-
 };
 
 
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
index 2938b5791c..9a529e961b 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -36,9 +36,16 @@ License
 #include "HashSet.H"
 #include "ListOps.H"
 #include "transform.H"
-
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(geomCellLooper, 0);
+    addToRunTimeSelectionTable(cellLooper, geomCellLooper, word);
+}
+
 
 // Extension factor of edges to make sure we catch intersections through
 // edge endpoints
@@ -49,17 +56,6 @@ const Foam::scalar Foam::geomCellLooper::pointEqualTol_ = 1e-3;
 Foam::scalar Foam::geomCellLooper::snapTol_ = 0.1;
 
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-defineTypeNameAndDebug(geomCellLooper, 0);
-addToRunTimeSelectionTable(cellLooper, geomCellLooper, word);
-
-}
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::scalar Foam::geomCellLooper::minEdgeLen(const label vertI) const
@@ -209,19 +205,12 @@ bool Foam::geomCellLooper::edgeEndsCut
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::geomCellLooper::geomCellLooper(const polyMesh& mesh)
 :
     cellLooper(mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::geomCellLooper::~geomCellLooper()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::geomCellLooper::cut
diff --git a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
index ef30af4f43..9d08252f1b 100644
--- a/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/geomCellLooper.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +57,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class plane;
 
 /*---------------------------------------------------------------------------*\
@@ -67,7 +68,6 @@ class geomCellLooper
 :
     public cellLooper
 {
-
     // Static
 
         //- Tolerance for point equal test. Fraction of edge length.
@@ -140,22 +140,18 @@ public:
         }
 
 
-
-
     // Constructors
 
-        //- Construct from components
-        geomCellLooper(const polyMesh& mesh);
+        //- Construct from mesh
+        explicit geomCellLooper(const polyMesh& mesh);
 
 
     //- Destructor
-    virtual ~geomCellLooper();
+    virtual ~geomCellLooper() = default;
 
 
     // Member Functions
 
-
-
         //- Create cut along circumference of celli. Gets current mesh cuts.
         //  Cut along circumference is expressed as loop of cuts plus weights
         //  for cuts along edges (only valid for edge cuts).
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
index f774f5f861..b8f4ec0c96 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
@@ -34,15 +34,14 @@ License
 #include "ListOps.H"
 #include "meshTools.H"
 #include "OFstream.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-defineTypeNameAndDebug(hexCellLooper, 0);
-addToRunTimeSelectionTable(cellLooper, hexCellLooper, word);
+    defineTypeNameAndDebug(hexCellLooper, 0);
+    addToRunTimeSelectionTable(cellLooper, hexCellLooper, word);
 }
 
 
@@ -150,7 +149,6 @@ void Foam::hexCellLooper::makeFace
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::hexCellLooper::hexCellLooper(const polyMesh& mesh)
 :
     geomCellLooper(mesh),
@@ -158,12 +156,6 @@ Foam::hexCellLooper::hexCellLooper(const polyMesh& mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::hexCellLooper::~hexCellLooper()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::hexCellLooper::cut
diff --git a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
index d412d59252..4f320d2896 100644
--- a/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/hexCellLooper.H
@@ -53,7 +53,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class cellModel;
 
 /*---------------------------------------------------------------------------*\
@@ -64,10 +64,9 @@ class hexCellLooper
 :
     public geomCellLooper
 {
-
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Reference to hex cell shape.
         const cellModel& hex_;
@@ -114,12 +113,12 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        hexCellLooper(const polyMesh& mesh);
+        //- Construct from mesh
+        explicit hexCellLooper(const polyMesh& mesh);
 
 
     //- Destructor
-    virtual ~hexCellLooper();
+    virtual ~hexCellLooper() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index 978d4ac163..90e6ce2e99 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -33,7 +33,6 @@ License
 #include "ListOps.H"
 #include "meshTools.H"
 #include "hexMatcher.H"
-
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -662,19 +661,12 @@ void Foam::topoCellLooper::walkSplitHex
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::topoCellLooper::topoCellLooper(const polyMesh& mesh)
 :
     hexCellLooper(mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::topoCellLooper::~topoCellLooper()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::topoCellLooper::cut
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
index df1993d88d..521f537916 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +60,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class cellFeatures;
 
 /*---------------------------------------------------------------------------*\
@@ -70,7 +71,6 @@ class topoCellLooper
 :
     public hexCellLooper
 {
-
     // Private Member Functions
 
         //- In-memory truncate a list
@@ -166,12 +166,12 @@ public:
 
     // Constructors
 
-        //- Construct from components
-        topoCellLooper(const polyMesh& mesh);
+        //- Construct from mesh
+        explicit topoCellLooper(const polyMesh& mesh);
 
 
     //- Destructor
-    virtual ~topoCellLooper();
+    virtual ~topoCellLooper() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H
index 51d1108894..f4cfec2eb5 100644
--- a/src/dynamicMesh/meshCut/directions/directions.H
+++ b/src/dynamicMesh/meshCut/directions/directions.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class twoDPointCorrector;
 class primitiveMesh;
@@ -68,10 +69,9 @@ class directions
 :
     public List<vectorField>
 {
-
 public:
 
-    // Data types
+    // Data Types
 
         //- Enumeration listing the possible coordinate directions.
         enum directionType
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
index b68e84b082..31a3569f6f 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
@@ -30,7 +30,6 @@ License
 #include "meshTools.H"
 #include "refineCell.H"
 
-
 // * * * * * * * * * * * * * * * Static Functions  * * * * * * * * * * * * * //
 
 // Update stored refine list using map
diff --git a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
index bca48e0ae7..8a4a2c797e 100644
--- a/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
+++ b/src/dynamicMesh/meshCut/edgeVertex/edgeVertex.H
@@ -31,6 +31,7 @@ Description
     cell circumference.
 
 SourceFiles
+    edgeVertex.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -45,7 +46,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class refineCell;
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +55,7 @@ class refineCell;
 
 class edgeVertex
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh. (could be primitive mesh but keeping polyMesh
         //  here saves storing reference at higher levels where we do need it)
@@ -90,7 +91,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        edgeVertex(const polyMesh& mesh)
+        explicit edgeVertex(const polyMesh& mesh)
         :
             mesh_(mesh)
         {}
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 4b40895328..a6abda9e91 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -385,7 +385,6 @@ bool Foam::boundaryCutter::splitFace
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::boundaryCutter::boundaryCutter(const polyMesh& mesh)
 :
     mesh_(mesh),
@@ -394,12 +393,6 @@ Foam::boundaryCutter::boundaryCutter(const polyMesh& mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::boundaryCutter::~boundaryCutter()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::boundaryCutter::setRefinement
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index eb1c510c20..b5fc66bbad 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +56,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyTopoChange;
 class mapPolyMesh;
 class polyMesh;
@@ -127,11 +128,11 @@ public:
     // Constructors
 
         //- Construct from mesh
-        boundaryCutter(const polyMesh& mesh);
+        explicit boundaryCutter(const polyMesh& mesh);
 
 
     //- Destructor
-    ~boundaryCutter();
+    ~boundaryCutter() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index ae0acad43c..eaedcda3c2 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -563,7 +563,6 @@ Foam::face Foam::meshCutAndRemove::loopToFace
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::meshCutAndRemove::meshCutAndRemove(const polyMesh& mesh)
 :
     edgeVertex(mesh),
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index 568522fb42..e198697f63 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +28,7 @@ Class
     Foam::meshCutAndRemove
 
 Description
-    like meshCutter but also removes non-anchor side of cell.
+    Like meshCutter but also removes non-anchor side of cell.
 
 SourceFiles
     meshCutAndRemove.C
@@ -49,7 +50,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class Time;
 class polyTopoChange;
 class cellCuts;
@@ -65,14 +66,14 @@ class meshCutAndRemove
 :
     public edgeVertex
 {
-    // Private data
+    // Private Data
 
-        //- Faces added in last setRefinement. Per split cell label of added
-        //  face
+        //- Faces added in last setRefinement.
+        //  Per split cell label of added face
         Map<label> addedFaces_;
 
-        //- Points added in last setRefinement. Per split edge label of added
-        //  point
+        //- Points added in last setRefinement.
+        //  Per split edge label of added point
         EdgeMap<label> addedPoints_;
 
 
@@ -193,7 +194,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        meshCutAndRemove(const polyMesh& mesh);
+        explicit meshCutAndRemove(const polyMesh& mesh);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index fb38c182e0..7595c7ac07 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -516,12 +516,6 @@ Foam::meshCutter::meshCutter(const polyMesh& mesh)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::meshCutter::~meshCutter()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::meshCutter::setRefinement
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index 04ce87f9a1..0c8d7de3f5 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -124,7 +125,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class Time;
 class polyTopoChange;
 class cellCuts;
@@ -276,11 +277,11 @@ public:
     // Constructors
 
         //- Construct from mesh
-        meshCutter(const polyMesh& mesh);
+        explicit meshCutter(const polyMesh& mesh);
 
 
     //- Destructor
-    ~meshCutter();
+    ~meshCutter() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
index fc38a72705..dadc3556e6 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.H
@@ -65,7 +65,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class undoableMeshCutter;
 class cellLooper;
 class topoSet;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
index 4e98801bf7..8c0255803b 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
@@ -47,7 +47,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::refinementIterator::refinementIterator
 (
     polyMesh& mesh,
@@ -67,7 +66,7 @@ Foam::refinementIterator::refinementIterator
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::refinementIterator::~refinementIterator()
-{}
+{}  // Define here since polyMesh was forward declared
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
index 2971e20627..6ae7216d2e 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +55,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class refineCell;
 class undoableMeshCutter;
@@ -68,7 +69,7 @@ class refinementIterator
 :
     public edgeVertex
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         polyMesh& mesh_;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index a8bf4186b1..202cfb2595 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
@@ -174,7 +174,6 @@ void Foam::undoableMeshCutter::updateLabels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::undoableMeshCutter::undoableMeshCutter
 (
     const polyMesh& mesh,
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
index 039fbf3bbd..7c70428956 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.H
@@ -59,8 +59,6 @@ Description
 
     - liveSplitCells contains pointers to splitCells with null children.
 
-
-
 SourceFiles
     undoableMeshCutter.C
 
@@ -83,7 +81,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class refineCell;
@@ -97,7 +95,7 @@ class undoableMeshCutter
 :
     public meshCutter
 {
-    // Private data
+    // Private Data
 
         //- Whether or not to store actions for unplaying.
         const bool undoable_;
@@ -143,12 +141,15 @@ public:
     ClassName("undoableMeshCutter");
 
 
-
     // Constructors
 
         //- Construct from mesh and flag whether refinement pattern needs
-        //  to be stored.
-        undoableMeshCutter(const polyMesh& mesh, const bool undoable = true);
+        //- to be stored.
+        explicit undoableMeshCutter
+        (
+            const polyMesh& mesh,
+            const bool undoable = true
+        );
 
 
     //- Destructor
diff --git a/src/dynamicMesh/meshCut/refineCell/refineCell.H b/src/dynamicMesh/meshCut/refineCell/refineCell.H
index 5008a4b27e..f09b513886 100644
--- a/src/dynamicMesh/meshCut/refineCell/refineCell.H
+++ b/src/dynamicMesh/meshCut/refineCell/refineCell.H
@@ -45,10 +45,8 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
-
+// Forward Declarations
 class refineCell;
-
 Ostream& operator<<(Ostream&, const refineCell&);
 
 
@@ -58,26 +56,27 @@ Ostream& operator<<(Ostream&, const refineCell&);
 
 class refineCell
 {
-    // Private data
+    // Private Data
 
-    //- Cell label
-    label cellNo_;
+        //- Cell label
+        label cellNo_;
+
+        //- Preferred refinement direction (always normalized).
+        vector direction_;
 
-    //- Preferred refinement direction (always normalized).
-    vector direction_;
 
 public:
 
     // Constructors
 
-        //- Null
+        //- Default construct
         refineCell();
 
         //- From components. Vector will be normalized upon construction.
-        refineCell(const label, const vector&);
+        refineCell(const label celli, const vector& direction);
 
         //- From Istream. Vector will be normalized upon construction.
-        refineCell(Istream& is);
+        explicit refineCell(Istream& is);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.C b/src/dynamicMesh/meshCut/splitCell/splitCell.C
index 99ec9ac24e..4532b1b3ca 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.C
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.C
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from cell number and parent
 Foam::splitCell::splitCell(const label celli, splitCell* parent)
 :
     celli_(celli),
diff --git a/src/dynamicMesh/meshCut/splitCell/splitCell.H b/src/dynamicMesh/meshCut/splitCell/splitCell.H
index b77b03367b..40c12cb1fb 100644
--- a/src/dynamicMesh/meshCut/splitCell/splitCell.H
+++ b/src/dynamicMesh/meshCut/splitCell/splitCell.H
@@ -45,24 +45,22 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-
 /*---------------------------------------------------------------------------*\
                            Class splitCell Declaration
 \*---------------------------------------------------------------------------*/
 
 class splitCell
 {
-    // Private data
+    // Private Data
 
-        //- Unsplit cell label. Only uptodate if this cell is 'live'
-        //  (i.e. no master or slave)
+        //- Unsplit cell label.
+        //  Only uptodate if this cell is 'live' (i.e. no master or slave)
         label celli_;
 
-        //- Parent splitCell or null
+        //- Parent splitCell or nullptr
         splitCell* parent_;
 
-        //- Cells replacing this or null
+        //- Cells replacing this or nullptr
         splitCell* master_;
 
         splitCell* slave_;
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index cff58381cd..06fac222cc 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
@@ -324,7 +324,6 @@ bool Foam::polyMeshGeometry::checkFaceTet
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::polyMeshGeometry::polyMeshGeometry(const polyMesh& mesh)
 :
     mesh_(mesh)
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H
index 7ee98b1d7e..242c925e09 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H
+++ b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,7 +132,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        polyMeshGeometry(const polyMesh&);
+        explicit polyMeshGeometry(const polyMesh&);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C
index 7e4859222b..00d7950235 100644
--- a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -130,18 +130,12 @@ Foam::codedPoints0MotionSolver::codedPoints0MotionSolver
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::codedPoints0MotionSolver::~codedPoints0MotionSolver()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::motionSolver&
 Foam::codedPoints0MotionSolver::redirectMotionSolver() const
 {
-    if (!redirectMotionSolverPtr_.valid())
+    if (!redirectMotionSolverPtr_)
     {
         // Get the dictionary for the solver and override the
         // solver name (in case it is not a subdictionary and contains
@@ -159,7 +153,8 @@ Foam::codedPoints0MotionSolver::redirectMotionSolver() const
             IOdictionary(io, constructDict)
         );
     }
-    return redirectMotionSolverPtr_();
+
+    return *redirectMotionSolverPtr_;
 }
 
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
index b8979588ef..f5fcc800c3 100644
--- a/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/codedPoints0/codedPoints0MotionSolver.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -154,7 +154,7 @@ public:
 
 
     //- Destructor
-    virtual ~codedPoints0MotionSolver();
+    virtual ~codedPoints0MotionSolver() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.C b/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.C
index 34070ec9b3..2a2b89aec5 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.C
@@ -128,12 +128,6 @@ Foam::zoneMotion::zoneMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::zoneMotion::~zoneMotion()
-{}
-
-
 // * * * * * * * * * * * * * * * * Members  * * * * * * * * * * * * * * //
 
 const Foam::labelList& Foam::zoneMotion::pointIDs() const
@@ -147,4 +141,5 @@ bool Foam::zoneMotion::moveAllCells() const
     return moveAllCells_;
 }
 
+
 // ************************************************************************* //
diff --git a/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.H b/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.H
index f8755f2a5e..aeb1427699 100644
--- a/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/displacement/zoneMotion.H
@@ -46,6 +46,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class polyMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -54,8 +55,7 @@ class polyMesh;
 
 class zoneMotion
 {
-     // Private data
-
+     // Private Data
 
         //- Points to move when cell zone is supplied
         labelList pointIDs_;
@@ -93,8 +93,7 @@ public:
 
 
     //- Destructor
-    virtual ~zoneMotion();
-
+    virtual ~zoneMotion() = default;
 };
 
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
index 9da7dbfc4d..3814271ecf 100644
--- a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
@@ -325,13 +325,6 @@ displacementInterpolationMotionSolver
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::displacementInterpolationMotionSolver::
-~displacementInterpolationMotionSolver()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::pointField>
diff --git a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
index ff2e6e0b11..2db4186ed7 100644
--- a/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
-    Copyright (C) 2015 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,7 @@ class displacementInterpolationMotionSolver
 :
     public displacementMotionSolver
 {
-    // Private data
+    // Private Data
 
         // Face zone information (note: could pack these to only contain
         // used zones)
@@ -131,7 +131,7 @@ public:
 
 
     //- Destructor
-    ~displacementInterpolationMotionSolver();
+    ~displacementInterpolationMotionSolver() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
index e07e5b8541..2fd56f1a4a 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,7 +46,8 @@ solidBodyMotionDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(p, iF),
-    SBMFPtr_()
+    SBMFPtr_(nullptr),
+    localPoints0Ptr_(nullptr)
 {}
 
 
@@ -58,7 +60,8 @@ solidBodyMotionDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(p, iF, dict, false),
-    SBMFPtr_(solidBodyMotionFunction::New(dict, this->db().time()))
+    SBMFPtr_(solidBodyMotionFunction::New(dict, this->db().time())),
+    localPoints0Ptr_(nullptr)
 {
     if (!dict.found("value"))
     {
@@ -82,7 +85,8 @@ solidBodyMotionDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(ptf, p, iF, mapper),
-    SBMFPtr_(ptf.SBMFPtr_().clone().ptr())
+    SBMFPtr_(ptf.SBMFPtr_().clone()),
+    localPoints0Ptr_(nullptr)
 {
     // For safety re-evaluate
 
@@ -101,7 +105,8 @@ solidBodyMotionDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(ptf),
-    SBMFPtr_(ptf.SBMFPtr_().clone().ptr())
+    SBMFPtr_(ptf.SBMFPtr_().clone()),
+    localPoints0Ptr_(nullptr)
 {}
 
 
@@ -113,7 +118,8 @@ solidBodyMotionDisplacementPointPatchVectorField
 )
 :
     fixedValuePointPatchVectorField(ptf, iF),
-    SBMFPtr_(ptf.SBMFPtr_().clone().ptr())
+    SBMFPtr_(ptf.SBMFPtr_().clone()),
+    localPoints0Ptr_(nullptr)
 {
     // For safety re-evaluate
 
@@ -130,7 +136,7 @@ solidBodyMotionDisplacementPointPatchVectorField
 const pointField&
 solidBodyMotionDisplacementPointPatchVectorField::localPoints0() const
 {
-    if (!localPoints0Ptr_.valid())
+    if (!localPoints0Ptr_)
     {
         pointIOField points0
         (
@@ -148,6 +154,7 @@ solidBodyMotionDisplacementPointPatchVectorField::localPoints0() const
 
         localPoints0Ptr_.reset(new pointField(points0, patch().meshPoints()));
     }
+
     return *localPoints0Ptr_;
 }
 
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
index 3b15464083..b999e7f3d0 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/pointPatchFields/derived/solidBodyMotionDisplacement/solidBodyMotionDisplacementPointPatchVectorField.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +55,7 @@ class solidBodyMotionDisplacementPointPatchVectorField
 :
     public fixedValuePointPatchVectorField
 {
-    // Private data
+    // Private Data
 
         //- The motion control function
         autoPtr<solidBodyMotionFunction> SBMFPtr_;
@@ -149,7 +150,8 @@ public:
 
             const pointField& localPoints0() const;
 
-        // Evaluation functions
+
+        // Evaluation Functions
 
             //- Update the coefficients associated with the patch field
             virtual void updateCoeffs();
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.C
index e1c0464908..b1e8e1d1d9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.C
@@ -59,12 +59,6 @@ Foam::solidBodyMotionFunctions::SDA::SDA
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::SDA::~SDA()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion Foam::solidBodyMotionFunctions::SDA::transformation() const
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
index 8341d9866a..e3cfe4be3c 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/SDA/SDA.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,7 +61,7 @@ class SDA
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Center of gravity
         vector CofG_;
@@ -135,7 +136,7 @@ public:
 
 
     //- Destructor
-    virtual ~SDA();
+    virtual ~SDA() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
index e9a74461a0..a1cba082e6 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.C
@@ -62,12 +62,6 @@ Foam::solidBodyMotionFunctions::axisRotationMotion::axisRotationMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::axisRotationMotion::~axisRotationMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
index 613af90f8e..31f99ce630 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/axisRotationMotion/axisRotationMotion.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +58,7 @@ class axisRotationMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Origin
         point origin_;
@@ -105,7 +106,7 @@ public:
 
 
     //- Destructor
-    virtual ~axisRotationMotion();
+    virtual ~axisRotationMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.C
index 9333e57263..71e5183696 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.C
@@ -79,12 +79,6 @@ Foam::solidBodyMotionFunctions::drivenLinearMotion::drivenLinearMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::drivenLinearMotion::~drivenLinearMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.H
index 0670d6ac77..46096124ab 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/drivenLinearMotion/drivenLinearMotion.H
@@ -115,7 +115,7 @@ public:
 
 
     //- Destructor
-    virtual ~drivenLinearMotion();
+    virtual ~drivenLinearMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.C
index aa78680458..ab76ead5eb 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.C
@@ -59,12 +59,6 @@ Foam::solidBodyMotionFunctions::linearMotion::linearMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::linearMotion::~linearMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
index 96572182f3..aeae22f166 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/linearMotion/linearMotion.H
@@ -56,7 +56,7 @@ class linearMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Linear velocity
         vector velocity_;
@@ -101,7 +101,7 @@ public:
 
 
     //- Destructor
-    virtual ~linearMotion();
+    virtual ~linearMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.C
index bf7bb55632..1bbd1e9fac 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.C
@@ -59,12 +59,6 @@ Foam::solidBodyMotionFunctions::multiMotion::multiMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::multiMotion::~multiMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
index 91272db8c6..8e8c2545d9 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/multiMotion/multiMotion.H
@@ -56,7 +56,7 @@ class multiMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Motions to combine
         PtrList<solidBodyMotionFunction> SBMFs_;
@@ -101,7 +101,7 @@ public:
 
 
     //- Destructor
-    virtual ~multiMotion();
+    virtual ~multiMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
index 4c39dce289..f31324ebf6 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.C
@@ -59,13 +59,6 @@ Foam::solidBodyMotionFunctions::oscillatingLinearMotion::oscillatingLinearMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::oscillatingLinearMotion::
-~oscillatingLinearMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
index 02da14f56f..3f6da0ae46 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingLinearMotion/oscillatingLinearMotion.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +57,7 @@ class oscillatingLinearMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Amplitude
         vector amplitude_;
@@ -104,7 +105,7 @@ public:
 
 
     //- Destructor
-    virtual ~oscillatingLinearMotion();
+    virtual ~oscillatingLinearMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
index 44f0be397b..030d2e9629 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.C
@@ -62,13 +62,6 @@ oscillatingRotatingMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::oscillatingRotatingMotion::
-~oscillatingRotatingMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
index ee2c71b035..4aff489b81 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/oscillatingRotatingMotion/oscillatingRotatingMotion.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +57,7 @@ class oscillatingRotatingMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Centre of gravity
         point origin_;
@@ -107,7 +108,7 @@ public:
 
 
     //- Destructor
-    virtual ~oscillatingRotatingMotion();
+    virtual ~oscillatingRotatingMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index 10387ff5ec..b90a19836f 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -28,9 +28,6 @@ License
 
 #include "rotatingMotion.H"
 #include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
-
-using namespace Foam::constant::mathematical;
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -64,12 +61,6 @@ Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::rotatingMotion::~rotatingMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
@@ -98,7 +89,7 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
 
     omega_.reset
     (
-        Function1<scalar>::New("omega", SBMFCoeffs_).ptr()
+        Function1<scalar>::New("omega", SBMFCoeffs_)
     );
 
     return true;
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
index 14c998229b..ff9106bce8 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -61,7 +62,7 @@ class rotatingMotion
 :
     public solidBodyMotionFunction
 {
-    // Private data
+    // Private Data
 
         //- Origin of the axis
         const vector origin_;
@@ -112,7 +113,7 @@ public:
 
 
     //- Destructor
-    virtual ~rotatingMotion();
+    virtual ~rotatingMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
index 32f6135f5b..a530af913b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.C
@@ -55,12 +55,6 @@ Foam::solidBodyMotionFunction::solidBodyMotionFunction
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunction::~solidBodyMotionFunction()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 bool Foam::solidBodyMotionFunction::read(const dictionary& SBMFCoeffs)
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
index 18c42c46af..b6ad4c7a5b 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/solidBodyMotionFunction/solidBodyMotionFunction.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,22 +58,21 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
- s                  Class solidBodyMotionFunction Declaration
+                    Class solidBodyMotionFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class solidBodyMotionFunction
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         dictionary SBMFCoeffs_;
+
         const Time& time_;
 
 
-private:
-
-    // Private Member Functions
+    // Protected Member Functions
 
         //- No copy construct
         solidBodyMotionFunction(const solidBodyMotionFunction&) = delete;
@@ -123,7 +123,7 @@ public:
 
 
     //- Destructor
-    virtual ~solidBodyMotionFunction();
+    virtual ~solidBodyMotionFunction() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
index 7f8fa57e1a..e9668c8044 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.C
@@ -65,12 +65,6 @@ Foam::solidBodyMotionFunctions::tabulated6DoFMotion::tabulated6DoFMotion
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::solidBodyMotionFunctions::tabulated6DoFMotion::~tabulated6DoFMotion()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::septernion
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
index 50d0d0aa98..cd583521a1 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/tabulated6DoFMotion/tabulated6DoFMotion.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -117,7 +118,7 @@ public:
 
 
     //- Destructor
-    virtual ~tabulated6DoFMotion();
+    virtual ~tabulated6DoFMotion() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 797d0c494f..d255a3ada1 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -195,12 +195,6 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::iNew::operator()
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::motionSolver::~motionSolver()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::pointField> Foam::motionSolver::newPoints()
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index 87997426ce..576f4931b3 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
@@ -49,7 +49,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -60,7 +60,7 @@ class motionSolver
 :
     public IOdictionary
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -136,7 +136,7 @@ public:
 
 
     //- Destructor
-    virtual ~motionSolver();
+    virtual ~motionSolver() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
index 51a56d94f8..a376060126 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.C
@@ -61,12 +61,6 @@ Foam::velocityMotionSolver::velocityMotionSolver
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::velocityMotionSolver::~velocityMotionSolver()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::velocityMotionSolver::movePoints(const pointField& p)
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
index 445196a726..f0f1186a24 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityMotionSolver.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +49,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -60,14 +62,13 @@ class velocityMotionSolver
 {
 protected:
 
-    // Protected data
+    // Protected Data
 
         //- Point motion field
         mutable pointVectorField pointMotionU_;
 
-private:
 
-    // Private Member Functions
+    // Protected Member Functions
 
         //- No copy construct
         velocityMotionSolver(const velocityMotionSolver&) = delete;
@@ -93,7 +94,7 @@ public:
 
 
     //- Destructor
-    virtual ~velocityMotionSolver();
+    virtual ~velocityMotionSolver() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index bd24e60198..2a86c2ae94 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -126,12 +126,6 @@ Foam::perfectInterface::perfectInterface
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::perfectInterface::~perfectInterface()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::perfectInterface::changeTopology() const
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H
index b394c96edc..20352c4bee 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.H
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +49,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class Time;
 
 /*---------------------------------------------------------------------------*\
@@ -59,7 +60,7 @@ class perfectInterface
 :
     public polyMeshModifier
 {
-    // Private data
+    // Private Data
 
         //- Master face zone ID
         faceZoneID faceZoneID_;
@@ -70,10 +71,11 @@ class perfectInterface
         //- Slave patch ID
         polyPatchID slavePatchID_;
 
-        //- Tolerance used for distance comparison (fraction of minimum edge
-        //  length)
+        //- Tolerance used for distance comparison
+        //  (fraction of minimum edge length)
         static const scalar tol_;
 
+
     // Private Member Functions
 
         //- Calculate face centres on patch
@@ -117,7 +119,7 @@ public:
 
 
     //- Destructor
-    virtual ~perfectInterface();
+    virtual ~perfectInterface() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/pointPatchDist/pointPatchDist.C b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
index 92f64f802d..778a9cb73a 100644
--- a/src/dynamicMesh/pointPatchDist/pointPatchDist.C
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.C
@@ -59,12 +59,6 @@ Foam::pointPatchDist::pointPatchDist
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::pointPatchDist::~pointPatchDist()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::pointPatchDist::correct()
diff --git a/src/dynamicMesh/pointPatchDist/pointPatchDist.H b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
index 8abdb71c1a..7e1519f373 100644
--- a/src/dynamicMesh/pointPatchDist/pointPatchDist.H
+++ b/src/dynamicMesh/pointPatchDist/pointPatchDist.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -44,6 +45,7 @@ SourceFiles
 namespace Foam
 {
 
+// Forward Declarations
 class pointMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -54,7 +56,6 @@ class pointPatchDist
 :
     public pointScalarField
 {
-
 private:
 
     // Private Member Data
@@ -92,7 +93,7 @@ public:
 
 
     //- Destructor
-    virtual ~pointPatchDist();
+    virtual ~pointPatchDist() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index b2c29a7126..0e96c24080 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -2088,12 +2088,6 @@ Foam::faceCoupleInfo::faceCoupleInfo
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::faceCoupleInfo::~faceCoupleInfo()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::labelList Foam::faceCoupleInfo::faceLabels(const polyPatch& pp)
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
index c02f1c1329..afa78dce6a 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -147,7 +148,7 @@ namespace Foam
 typedef HashTable<labelList, edge, Hash<edge>> edgeLookup;
 
 
-// Forward declaration of classes
+// Forward Declarations
 class face;
 class primitiveMesh;
 class polyPatch;
@@ -159,16 +160,16 @@ class polyMesh;
 
 class faceCoupleInfo
 {
-    // Private data
+    // Private Data
 
         //- Angle matching tolerance.
         static const scalar angleTol_;
 
         //- Master patch
-        autoPtr<indirectPrimitivePatch> masterPatchPtr_;
+        unique_ptr<indirectPrimitivePatch> masterPatchPtr_;
 
         //- Slave patch
-        autoPtr<indirectPrimitivePatch> slavePatchPtr_;
+        unique_ptr<indirectPrimitivePatch> slavePatchPtr_;
 
 
         //- Description of cut.
@@ -185,7 +186,8 @@ class faceCoupleInfo
         //  them)
         //  Orientation of cutFaces should be same as masterFaces!
         pointField cutPoints_;
-        autoPtr<primitiveFacePatch> cutFacesPtr_;
+
+        unique_ptr<primitiveFacePatch> cutFacesPtr_;
 
         //- Additional point coupling information. Is between points on
         //  boundary of both meshes.
@@ -432,7 +434,7 @@ public:
 
 
     //- Destructor
-    ~faceCoupleInfo();
+    ~faceCoupleInfo() = default;
 
 
 
diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
index c04eff109a..f59adcb5f7 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +52,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class IOobject;
 class polyTopoChange;
 
@@ -61,9 +62,6 @@ class polyTopoChange;
 
 class polyMeshAdder
 {
-
-private:
-
     // Private Member Functions
 
         //- Index of patch in allPatches. Add if nonexisting.
@@ -247,8 +245,8 @@ private:
             polyMesh& mesh
         );
 
-public:
 
+public:
 
     // Member Functions
 
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index d05b39e3e8..d563d0e5e9 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -967,12 +967,6 @@ Foam::polyMeshFilter::polyMeshFilter
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::polyMeshFilter::~polyMeshFilter()
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::label Foam::polyMeshFilter::filter(const label nOriginalBadFaces)
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
index 3567be3e0e..6efd53b78a 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -219,7 +220,7 @@ public:
 
 
     //- Destructor
-    ~polyMeshFilter();
+    ~polyMeshFilter() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C
index 56f9c15524..9c8fe404d1 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.C
@@ -38,13 +38,11 @@ Description
 namespace Foam
 {
     defineTypeNameAndDebug(polyMeshModifier, 0);
-
     defineRunTimeSelectionTable(polyMeshModifier, dictionary);
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::polyMeshModifier::polyMeshModifier
 (
     const word& name,
@@ -60,12 +58,6 @@ Foam::polyMeshModifier::polyMeshModifier
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::polyMeshModifier::~polyMeshModifier()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::polyTopoChanger& Foam::polyMeshModifier::topoChanger() const
diff --git a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
index 3a28da946b..62bc93bcfc 100644
--- a/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
+++ b/src/dynamicMesh/polyTopoChange/polyMeshModifier/polyMeshModifier.H
@@ -53,14 +53,10 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyTopoChanger;
 class polyTopoChange;
 class mapPolyMesh;
-
-
-// Forward declaration of friend functions and operators
-
 class polyMeshModifier;
 
 Ostream& operator<<(Ostream&, const polyMeshModifier&);
@@ -146,7 +142,7 @@ public:
 
 
     //- Destructor
-    virtual ~polyMeshModifier();
+    virtual ~polyMeshModifier() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
index f695c93621..9e503ea995 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2015 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -114,7 +115,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
@@ -127,7 +128,7 @@ class globalIndex;
 
 class addPatchCellLayer
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -263,12 +264,11 @@ public:
     // Constructors
 
         //- Construct from mesh.
-        addPatchCellLayer(const polyMesh&, const bool addToMesh = true);
+        explicit addPatchCellLayer(const polyMesh&, const bool addToMesh=true);
 
 
     // Member Functions
 
-
         // Access
 
             //- Added points per patch point.
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
index c70d074589..1768add779 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/combineFaces.H
@@ -46,7 +46,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
@@ -58,7 +58,7 @@ class face;
 
 class combineFaces
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -79,7 +79,6 @@ class combineFaces
         pointField savedPoints_;
 
 
-
     // Private Member Functions
 
         //- Test if face is convex. Allow slight concavity through
@@ -118,7 +117,6 @@ class combineFaces
         ) const;
 
 
-
         //- No copy construct
         combineFaces(const combineFaces&) = delete;
 
@@ -134,7 +132,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        combineFaces(const polyMesh& mesh, const bool undoable = false);
+        explicit combineFaces(const polyMesh& mesh, const bool undoable=false);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
index 7ba0613480..0bcb3be0de 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.C
@@ -46,7 +46,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh
 Foam::duplicatePoints::duplicatePoints(const polyMesh& mesh)
 :
     mesh_(mesh),
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
index e3639238c5..722fc83085 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/duplicatePoints.H
@@ -45,7 +45,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class edge;
@@ -87,7 +87,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        duplicatePoints(const polyMesh& mesh);
+        explicit duplicatePoints(const polyMesh& mesh);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index edcffc2f36..acb59ae51f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -54,7 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class polyMesh;
 class bitSet;
 class polyTopoChange;
@@ -254,7 +254,7 @@ public:
     // Constructors
 
         //- Construct from mesh
-        edgeCollapser(const polyMesh& mesh);
+        explicit edgeCollapser(const polyMesh& mesh);
 
         //- Construct from mesh and dict
         edgeCollapser(const polyMesh& mesh, const dictionary& dict);
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
index 32435fe835..476b3228de 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +67,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
@@ -77,7 +78,7 @@ class mapPolyMesh;
 
 class faceCollapser
 {
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -130,7 +131,7 @@ public:
     // Constructors
 
         //- Construct from mesh.
-        faceCollapser(const polyMesh& mesh);
+        explicit faceCollapser(const polyMesh& mesh);
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 827d637eaf..4feaa1b1ac 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -2040,7 +2040,6 @@ Foam::hexRef8::hexRef8(const polyMesh& mesh, const bool readHistory)
 }
 
 
-// Construct from components
 Foam::hexRef8::hexRef8
 (
     const polyMesh& mesh,
@@ -2150,7 +2149,6 @@ Foam::hexRef8::hexRef8
 }
 
 
-// Construct from components
 Foam::hexRef8::hexRef8
 (
     const polyMesh& mesh,
@@ -5011,7 +5009,7 @@ void Foam::hexRef8::checkRefinementLevels
 
 const Foam::cellShapeList& Foam::hexRef8::cellShapes() const
 {
-    if (cellShapesPtr_.empty())
+    if (!cellShapesPtr_)
     {
         if (debug)
         {
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
index 0bd9e3c088..681ef62f0d 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyPatch;
 class polyTopoChange;
@@ -67,7 +67,7 @@ class mapDistributePolyMesh;
 
 class hexRef8
 {
-    // Private data
+    // Private Data
 
         //- Reference to underlying mesh.
         const polyMesh& mesh_;
@@ -362,7 +362,7 @@ public:
         //- Construct from mesh, read_if_present refinement data
         //  (from write below). If readHistory is true does read_if_present
         //  of refinement history. If false clears all history
-        hexRef8(const polyMesh& mesh, const bool readHistory = true);
+        explicit hexRef8(const polyMesh& mesh, const bool readHistory=true);
 
         //- Construct from mesh and un/refinement data and optional size of
         //  starting cells
@@ -593,7 +593,6 @@ public:
 
             //- Helper: remove all relevant files from mesh instance
             static void removeFiles(const polyMesh&);
-
 };
 
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
index 7ae94cf814..1163c1686e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2017 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 
 #include "IOobject.H"
 #include "UList.H"
-
 #include "hexRef8Data.H"
 #include "mapPolyMesh.H"
 #include "mapDistributePolyMesh.H"
@@ -42,59 +41,47 @@ License
 Foam::hexRef8Data::hexRef8Data(const IOobject& io)
 {
     {
-        IOobject rio(io);
-        rio.rename("cellLevel");
-        bool haveFile = returnReduce
-        (
-            rio.typeHeaderOk<labelIOList>(true),
-            orOp<bool>()
-        );
-        if (haveFile)
+        typedef labelIOList Type;
+        IOobject rio(io, "cellLevel");
+
+        // haveFile
+        if (returnReduce(rio.typeHeaderOk<Type>(true), orOp<bool>()))
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
-            cellLevelPtr_.reset(new labelIOList(rio));
+            cellLevelPtr_.reset(new Type(rio));
         }
     }
     {
-        IOobject rio(io);
-        rio.rename("pointLevel");
-        bool haveFile = returnReduce
-        (
-            rio.typeHeaderOk<labelIOList>(true),
-            orOp<bool>()
-        );
-        if (haveFile)
+        typedef labelIOList Type;
+        IOobject rio(io, "pointLevel");
+
+        // haveFile
+        if (returnReduce(rio.typeHeaderOk<Type>(true), orOp<bool>()))
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
-            pointLevelPtr_.reset(new labelIOList(rio));
+            pointLevelPtr_.reset(new Type(rio));
         }
     }
     {
-        IOobject rio(io);
-        rio.rename("level0Edge");
-        bool haveFile = returnReduce
-        (
-            rio.typeHeaderOk<uniformDimensionedScalarField>(true),
-            orOp<bool>()
-        );
-        if (haveFile)
+        typedef uniformDimensionedScalarField Type;
+        IOobject rio(io, "level0Edge");
+
+        // haveFile
+        if (returnReduce(rio.typeHeaderOk<Type>(true), orOp<bool>()))
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
-            level0EdgePtr_.reset(new uniformDimensionedScalarField(rio));
+            level0EdgePtr_.reset(new Type(rio));
         }
     }
     {
-        IOobject rio(io);
-        rio.rename("refinementHistory");
-        bool haveFile = returnReduce
-        (
-            rio.typeHeaderOk<refinementHistory>(true),
-            orOp<bool>()
-        );
-        if (haveFile)
+        typedef refinementHistory Type;
+        IOobject rio(io, "refinementHistory");
+
+        // haveFile
+        if (returnReduce(rio.typeHeaderOk<Type>(true), orOp<bool>()))
         {
             Info<< "Reading hexRef8 data : " << rio.name() << endl;
-            refHistoryPtr_.reset(new refinementHistory(rio));
+            refHistoryPtr_.reset(new Type(rio));
         }
     }
 }
@@ -108,10 +95,9 @@ Foam::hexRef8Data::hexRef8Data
     const labelList& pointMap
 )
 {
-    if (data.cellLevelPtr_.valid())
+    if (data.cellLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename(data.cellLevelPtr_().name());
+        IOobject rio(io, data.cellLevelPtr_().name());
 
         cellLevelPtr_.reset
         (
@@ -122,10 +108,9 @@ Foam::hexRef8Data::hexRef8Data
             )
         );
     }
-    if (data.pointLevelPtr_.valid())
+    if (data.pointLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename(data.pointLevelPtr_().name());
+        IOobject rio(io, data.pointLevelPtr_().name());
 
         pointLevelPtr_.reset
         (
@@ -136,20 +121,18 @@ Foam::hexRef8Data::hexRef8Data
             )
         );
     }
-    if (data.level0EdgePtr_.valid())
+    if (data.level0EdgePtr_)
     {
-        IOobject rio(io);
-        rio.rename(data.level0EdgePtr_().name());
+        IOobject rio(io, data.level0EdgePtr_().name());
 
         level0EdgePtr_.reset
         (
             new uniformDimensionedScalarField(rio, data.level0EdgePtr_())
         );
     }
-    if (data.refHistoryPtr_.valid())
+    if (data.refHistoryPtr_)
     {
-        IOobject rio(io);
-        rio.rename(data.refHistoryPtr_().name());
+        IOobject rio(io, data.refHistoryPtr_().name());
 
         refHistoryPtr_ = data.refHistoryPtr_().clone(rio, cellMap);
     }
@@ -168,13 +151,12 @@ Foam::hexRef8Data::hexRef8Data
 
     // cellLevel
 
-    if (procDatas[0].cellLevelPtr_.valid())
+    if (procDatas[0].cellLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename(procDatas[0].cellLevelPtr_().name());
+        IOobject rio(io, procDatas[0].cellLevelPtr_().name());
 
         cellLevelPtr_.reset(new labelIOList(rio, mesh.nCells()));
-        labelList& cellLevel = cellLevelPtr_();
+        auto& cellLevel = *cellLevelPtr_;
 
         forAll(procDatas, procI)
         {
@@ -186,13 +168,12 @@ Foam::hexRef8Data::hexRef8Data
 
     // pointLevel
 
-    if (procDatas[0].pointLevelPtr_.valid())
+    if (procDatas[0].pointLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename(procDatas[0].pointLevelPtr_().name());
+        IOobject rio(io, procDatas[0].pointLevelPtr_().name());
 
         pointLevelPtr_.reset(new labelIOList(rio, mesh.nPoints()));
-        labelList& pointLevel = pointLevelPtr_();
+        auto& pointLevel = *pointLevelPtr_;
 
         forAll(procDatas, procI)
         {
@@ -204,10 +185,9 @@ Foam::hexRef8Data::hexRef8Data
 
     // level0Edge
 
-    if (procDatas[0].level0EdgePtr_.valid())
+    if (procDatas[0].level0EdgePtr_)
     {
-        IOobject rio(io);
-        rio.rename(procDatas[0].level0EdgePtr_().name());
+        IOobject rio(io, procDatas[0].level0EdgePtr_().name());
 
         level0EdgePtr_.reset
         (
@@ -222,10 +202,9 @@ Foam::hexRef8Data::hexRef8Data
 
     // refinementHistory
 
-    if (procDatas[0].refHistoryPtr_.valid())
+    if (procDatas[0].refHistoryPtr_)
     {
-        IOobject rio(io);
-        rio.rename(procDatas[0].refHistoryPtr_().name());
+        IOobject rio(io, procDatas[0].refHistoryPtr_().name());
 
         UPtrList<const refinementHistory> procRefs(procDatas.size());
         forAll(procDatas, i)
@@ -246,23 +225,16 @@ Foam::hexRef8Data::hexRef8Data
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::hexRef8Data::~hexRef8Data()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::hexRef8Data::sync(const IOobject& io)
 {
     const polyMesh& mesh = dynamic_cast<const polyMesh&>(io.db());
 
-    bool hasCellLevel = returnReduce(cellLevelPtr_.valid(), orOp<bool>());
-    if (hasCellLevel && !cellLevelPtr_.valid())
+    bool hasCellLevel = returnReduce(bool(cellLevelPtr_), orOp<bool>());
+    if (hasCellLevel && !cellLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename("cellLevel");
+        IOobject rio(io, "cellLevel");
         rio.readOpt() = IOobject::NO_READ;
         cellLevelPtr_.reset
         (
@@ -270,11 +242,10 @@ void Foam::hexRef8Data::sync(const IOobject& io)
         );
     }
 
-    bool hasPointLevel = returnReduce(pointLevelPtr_.valid(), orOp<bool>());
-    if (hasPointLevel && !pointLevelPtr_.valid())
+    bool hasPointLevel = returnReduce(bool(pointLevelPtr_), orOp<bool>());
+    if (hasPointLevel && !pointLevelPtr_)
     {
-        IOobject rio(io);
-        rio.rename("pointLevel");
+        IOobject rio(io, "pointLevel");
         rio.readOpt() = IOobject::NO_READ;
         pointLevelPtr_.reset
         (
@@ -282,16 +253,15 @@ void Foam::hexRef8Data::sync(const IOobject& io)
         );
     }
 
-    bool hasLevel0Edge = returnReduce(level0EdgePtr_.valid(), orOp<bool>());
+    bool hasLevel0Edge = returnReduce(bool(level0EdgePtr_), orOp<bool>());
     if (hasLevel0Edge)
     {
         // Get master length
         scalar masterLen = (Pstream::master() ? level0EdgePtr_().value() : 0);
         Pstream::scatter(masterLen);
-        if (!level0EdgePtr_.valid())
+        if (!level0EdgePtr_)
         {
-            IOobject rio(io);
-            rio.rename("level0Edge");
+            IOobject rio(io, "level0Edge");
             rio.readOpt() = IOobject::NO_READ;
             level0EdgePtr_.reset
             (
@@ -304,11 +274,10 @@ void Foam::hexRef8Data::sync(const IOobject& io)
         }
     }
 
-    bool hasHistory = returnReduce(refHistoryPtr_.valid(), orOp<bool>());
-    if (hasHistory && !refHistoryPtr_.valid())
+    bool hasHistory = returnReduce(bool(refHistoryPtr_), orOp<bool>());
+    if (hasHistory && !refHistoryPtr_)
     {
-        IOobject rio(io);
-        rio.rename("refinementHistory");
+        IOobject rio(io, "refinementHistory");
         rio.readOpt() = IOobject::NO_READ;
         refHistoryPtr_.reset(new refinementHistory(rio, mesh.nCells(), true));
     }
@@ -320,8 +289,8 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
     // Sanity check
     if
     (
-         (cellLevelPtr_.valid() && cellLevelPtr_().size() != map.nOldCells())
-      || (pointLevelPtr_.valid() && pointLevelPtr_().size() != map.nOldPoints())
+         (cellLevelPtr_ && cellLevelPtr_().size() != map.nOldCells())
+      || (pointLevelPtr_ && pointLevelPtr_().size() != map.nOldPoints())
     )
     {
         cellLevelPtr_.clear();
@@ -332,7 +301,7 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
     }
 
 
-    if (cellLevelPtr_.valid())
+    if (cellLevelPtr_)
     {
         const labelList& cellMap = map.cellMap();
         labelList& cellLevel = cellLevelPtr_();
@@ -354,7 +323,7 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
         cellLevel.transfer(newCellLevel);
         cellLevelPtr_().instance() = map.mesh().facesInstance();
     }
-    if (pointLevelPtr_.valid())
+    if (pointLevelPtr_)
     {
         const labelList& pointMap = map.pointMap();
         labelList& pointLevel = pointLevelPtr_();
@@ -378,7 +347,7 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
     }
 
 
-    if (refHistoryPtr_.valid() && refHistoryPtr_().active())
+    if (refHistoryPtr_ && refHistoryPtr_().active())
     {
         refHistoryPtr_().updateMesh(map);
         refHistoryPtr_().instance() = map.mesh().facesInstance();
@@ -388,18 +357,18 @@ void Foam::hexRef8Data::updateMesh(const mapPolyMesh& map)
 
 void Foam::hexRef8Data::distribute(const mapDistributePolyMesh& map)
 {
-    if (cellLevelPtr_.valid())
+    if (cellLevelPtr_)
     {
-        map.cellMap().distribute(cellLevelPtr_());
+        map.cellMap().distribute(*cellLevelPtr_);
     }
-    if (pointLevelPtr_.valid())
+    if (pointLevelPtr_)
     {
-        map.pointMap().distribute(pointLevelPtr_());
+        map.pointMap().distribute(*pointLevelPtr_);
     }
 
     // No need to distribute the level0Edge
 
-    if (refHistoryPtr_.valid() && refHistoryPtr_().active())
+    if (refHistoryPtr_ && refHistoryPtr_().active())
     {
         refHistoryPtr_().distribute(map);
     }
@@ -409,19 +378,19 @@ void Foam::hexRef8Data::distribute(const mapDistributePolyMesh& map)
 bool Foam::hexRef8Data::write() const
 {
     bool ok = true;
-    if (cellLevelPtr_.valid())
+    if (cellLevelPtr_)
     {
         ok = ok && cellLevelPtr_().write();
     }
-    if (pointLevelPtr_.valid())
+    if (pointLevelPtr_)
     {
         ok = ok && pointLevelPtr_().write();
     }
-    if (level0EdgePtr_.valid())
+    if (level0EdgePtr_)
     {
         ok = ok && level0EdgePtr_().write();
     }
-    if (refHistoryPtr_.valid())
+    if (refHistoryPtr_)
     {
         ok = ok && refHistoryPtr_().write();
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
index a23ba43f70..af9cc00e47 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,7 +48,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class mapPolyMesh;
 class mapDistributePolyMesh;
 class refinementHistory;
@@ -60,10 +60,7 @@ class fvMesh;
 
 class hexRef8Data
 {
-
-private:
-
-    // Private data
+    // Private Data
 
         autoPtr<labelIOList> cellLevelPtr_;
 
@@ -88,8 +85,8 @@ public:
     // Constructors
 
         //- Construct read. Has special provision for only some processors
-        //  having the files so can be used in redistribution.
-        hexRef8Data(const IOobject& io);
+        //- having the files so can be used in redistribution.
+        explicit hexRef8Data(const IOobject& io);
 
         //- Construct as subset
         hexRef8Data
@@ -111,7 +108,7 @@ public:
 
 
     //- Destructor
-    ~hexRef8Data();
+    ~hexRef8Data() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
index 11b98c08c1..73c38e38e1 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,7 +50,7 @@ void Foam::refinementHistory::writeEntry
 )
 {
     // Write me:
-    if (split.addedCellsPtr_.valid())
+    if (split.addedCellsPtr_)
     {
         Pout<< "parent:" << split.parent_
             << " subCells:" << split.addedCellsPtr_()
@@ -124,67 +124,65 @@ Foam::refinementHistory::splitCell8::splitCell8(const label parent)
 
 
 Foam::refinementHistory::splitCell8::splitCell8(Istream& is)
+:
+    splitCell8()
 {
     is >> *this;
 }
 
 
-Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& sc)
+Foam::refinementHistory::splitCell8::splitCell8(const splitCell8& rhs)
 :
-    parent_(sc.parent_),
-    addedCellsPtr_
-    (
-        sc.addedCellsPtr_.valid()
-      ? new FixedList<label, 8>(sc.addedCellsPtr_())
-      : nullptr
-    )
+    parent_(rhs.parent_),
+    addedCellsPtr_(rhs.addedCellsPtr_.clone()) // Copy, not steal
 {}
 
 
 // * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
 
-void Foam::refinementHistory::splitCell8::operator=(const splitCell8& s)
+void Foam::refinementHistory::splitCell8::operator=(const splitCell8& rhs)
 {
     // Assignment operator since autoPtr otherwise 'steals' storage.
 
-    if (this == &s)
+    if (this == &rhs)
     {
         return;  // Self-assignment is a no-op
     }
 
-    parent_ = s.parent_;
-
-    addedCellsPtr_.reset
-    (
-        s.addedCellsPtr_.valid()
-      ? new FixedList<label, 8>(s.addedCellsPtr_())
-      : nullptr
-    );
+    parent_ = rhs.parent_;
+    addedCellsPtr_.reset(rhs.addedCellsPtr_.clone()); // Copy, not steal
 }
 
 
-bool Foam::refinementHistory::splitCell8::operator==(const splitCell8& s) const
+bool Foam::refinementHistory::splitCell8::operator==
+(
+    const splitCell8& rhs
+)
+const
 {
-    if (addedCellsPtr_.valid() != s.addedCellsPtr_.valid())
+    if (parent_ != rhs.parent_)
     {
         return false;
     }
-    else if (parent_ != s.parent_)
+    if (bool(addedCellsPtr_) != bool(rhs.addedCellsPtr_))
     {
         return false;
     }
-    else if (addedCellsPtr_.valid())
+    else if (addedCellsPtr_)  // With previous test, means rhs is also defined
     {
-        return addedCellsPtr_() == s.addedCellsPtr_();
+        return addedCellsPtr_() == rhs.addedCellsPtr_();
     }
 
     return true;
 }
 
 
-bool Foam::refinementHistory::splitCell8::operator!=(const splitCell8& s) const
+bool Foam::refinementHistory::splitCell8::operator!=
+(
+    const splitCell8& rhs
+) const
 {
-    return !operator==(s);
+    return !operator==(rhs);
 }
 
 
@@ -219,17 +217,14 @@ Foam::Ostream& Foam::operator<<
     // output as fixedlist with e.g. -1 elements and check for this upon
     // reading. However would cause much more data to be transferred.
 
-    if (sc.addedCellsPtr_.valid())
+    labelList labels;
+
+    if (sc.addedCellsPtr_)
     {
-        return os
-            << sc.parent_
-            << token::SPACE
-            << labelList(sc.addedCellsPtr_());
-    }
-    else
-    {
-        return os << sc.parent_ << token::SPACE << labelList(0);
+        labels = sc.addedCellsPtr_();
     }
+
+    return os << sc.parent_ << token::SPACE << labels;
 }
 
 
@@ -280,7 +275,7 @@ Foam::label Foam::refinementHistory::allocateSplitCell
     {
         splitCell8& parentSplit = splitCells_[parent];
 
-        if (parentSplit.addedCellsPtr_.empty())
+        if (!parentSplit.addedCellsPtr_)
         {
             // Allocate storage on parent for the 8 subcells.
             parentSplit.addedCellsPtr_.reset(new FixedList<label, 8>(-1));
@@ -307,7 +302,7 @@ void Foam::refinementHistory::freeSplitCell(const label index)
         autoPtr<FixedList<label, 8>>& subCellsPtr =
             splitCells_[split.parent_].addedCellsPtr_;
 
-        if (subCellsPtr.valid())
+        if (subCellsPtr)
         {
             FixedList<label, 8>& subCells = subCellsPtr();
 
@@ -354,7 +349,7 @@ void Foam::refinementHistory::markSplit
         {
             markSplit(split.parent_, oldToNew, newSplitCells);
         }
-        if (split.addedCellsPtr_.valid())
+        if (split.addedCellsPtr_)
         {
             const FixedList<label, 8>& splits = split.addedCellsPtr_();
 
@@ -381,7 +376,7 @@ void Foam::refinementHistory::mark
 
     const splitCell8& split = splitCells_[index];
 
-    if (split.addedCellsPtr_.valid())
+    if (split.addedCellsPtr_)
     {
         const FixedList<label, 8>& splits = split.addedCellsPtr_();
 
@@ -809,7 +804,7 @@ Foam::refinementHistory::refinementHistory
                 newSplit.parent_ += offsets[refI];
             }
 
-            if (newSplit.addedCellsPtr_.valid())
+            if (newSplit.addedCellsPtr_)
             {
                 FixedList<label, 8>& splits = newSplit.addedCellsPtr_();
 
@@ -963,7 +958,7 @@ Foam::autoPtr<Foam::refinementHistory> Foam::refinementHistory::clone
         {
             split.parent_ = oldToNewSplit[split.parent_];
         }
-        if (split.addedCellsPtr_.valid())
+        if (split.addedCellsPtr_)
         {
             FixedList<label, 8>& splits = split.addedCellsPtr_();
 
@@ -1119,7 +1114,7 @@ void Foam::refinementHistory::updateMesh(const mapPolyMesh& map)
                 label index = visibleCells_[celli];
 
                 // Check not already set
-                if (splitCells_[index].addedCellsPtr_.valid())
+                if (splitCells_[index].addedCellsPtr_)
                 {
                     FatalErrorInFunction
                         << "Problem" << abort(FatalError);
@@ -1165,7 +1160,7 @@ void Foam::refinementHistory::subset
             label index = visibleCells_[oldCelli];
 
             // Check that cell is live (so its parent has no refinement)
-            if (index >= 0 && splitCells_[index].addedCellsPtr_.valid())
+            if (index >= 0 && splitCells_[index].addedCellsPtr_)
             {
                 FatalErrorInFunction
                     << "Problem" << abort(FatalError);
@@ -1363,7 +1358,7 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
             {
                 split.parent_ = oldToNew[split.parent_];
             }
-            if (split.addedCellsPtr_.valid())
+            if (split.addedCellsPtr_)
             {
                 FixedList<label, 8>& splits = split.addedCellsPtr_();
 
@@ -1443,7 +1438,7 @@ void Foam::refinementHistory::distribute(const mapDistributePolyMesh& map)
             {
                 split.parent_ += offset;
             }
-            if (split.addedCellsPtr_.valid())
+            if (split.addedCellsPtr_)
             {
                 FixedList<label, 8>& splits = split.addedCellsPtr_();
 
@@ -1538,7 +1533,7 @@ void Foam::refinementHistory::compact()
             if
             (
                 splitCells_[index].parent_ != -1
-             || splitCells_[index].addedCellsPtr_.valid()
+             || splitCells_[index].addedCellsPtr_
             )
             {
                 markSplit(index, oldToNew, newSplitCells);
@@ -1556,7 +1551,7 @@ void Foam::refinementHistory::compact()
         else if
         (
             splitCells_[index].parent_ == -1
-         && splitCells_[index].addedCellsPtr_.empty()
+         && !splitCells_[index].addedCellsPtr_
         )
         {
             // recombined cell. No need to keep since no parent and no subsplits
@@ -1581,7 +1576,7 @@ void Foam::refinementHistory::compact()
         {
             split.parent_ = oldToNew[split.parent_];
         }
-        if (split.addedCellsPtr_.valid())
+        if (split.addedCellsPtr_)
         {
             FixedList<label, 8>& splits = split.addedCellsPtr_();
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
index eb62701663..c0be971d0b 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,6 @@ Description
 
     The parent 0 refers back to the splitcell entries.
 
-
 SourceFiles
     refinementHistory.C
 
@@ -87,13 +86,10 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class mapPolyMesh;
 class mapDistributePolyMesh;
 class polyMesh;
-
-// Forward declaration of friend functions and operators
-
 class refinementHistory;
 
 Istream& operator>>(Istream&, refinementHistory&);
@@ -122,7 +118,7 @@ public:
         //- Cells this cell was refined into
         autoPtr<FixedList<label, 8>> addedCellsPtr_;
 
-        //- Construct null (parent = -1)
+        //- Default construct (parent = -1)
         splitCell8();
 
         //- Construct from parent
@@ -132,14 +128,14 @@ public:
         splitCell8(Istream& is);
 
         //- Construct as deep copy
-        splitCell8(const splitCell8&);
+        splitCell8(const splitCell8& rhs);
 
-        //- Copy operator since autoPtr otherwise 'steals' storage.
-        void operator=(const splitCell8& s);
+        //- Copy assignment (no autoPtr stealing)
+        void operator=(const splitCell8& rhs);
 
-        bool operator==(const splitCell8& s) const;
+        bool operator==(const splitCell8& rhs) const;
 
-        bool operator!=(const splitCell8& s) const;
+        bool operator!=(const splitCell8& rhs) const;
 
         friend Istream& operator>>(Istream&, splitCell8&);
         friend Ostream& operator<<(Ostream&, const splitCell8&);
@@ -148,7 +144,7 @@ public:
 
 private:
 
-    // Private data
+    // Private Data
 
         //- Is active?
         bool active_;
@@ -221,9 +217,9 @@ public:
 
     // Constructors
 
-        //- Construct (read) given an IOobject. If global number of visible
-        //  cells > 0 becomes active
-        refinementHistory(const IOobject&);
+        //- Construct (read) given an IOobject.
+        //  If global number of visible cells > 0 becomes active
+        explicit refinementHistory(const IOobject&);
 
         //- Construct (read) or construct from components
         refinementHistory
@@ -235,12 +231,12 @@ public:
         );
 
         //- Construct (read) or construct from initial number of cells
-        //  (all visible). If global number of visible
-        //  cells > 0 becomes active
+        //- (all visible).
+        //  If global number of visible cells > 0 becomes active
         refinementHistory(const IOobject&, const label nCells);
 
         //- Construct (read) or construct from initial number of cells
-        //  (all visible) and active flag
+        //- (all visible) and active flag
         refinementHistory
         (
             const IOobject&,
@@ -251,8 +247,8 @@ public:
         //- Construct as copy
         refinementHistory(const IOobject&, const refinementHistory&);
 
-        //- Construct from multiple refinement histories. If global number of
-        //  visible cells > 0 becomes active
+        //- Construct from multiple refinement histories.
+        //  If global number of visible cells > 0 becomes active
         refinementHistory
         (
             const IOobject&,
@@ -260,22 +256,22 @@ public:
             const UPtrList<const refinementHistory>&
         );
 
-        //- Construct from Istream. If global number of
-        //  visible cells > 0 becomes active
-        refinementHistory(const IOobject&, Istream&);
+        //- Construct from Istream.
+        //  If global number of visible cells > 0 becomes active
+        explicit refinementHistory(const IOobject&, Istream&);
 
 
     // Member Functions
 
 
         //- Per cell in the current mesh (i.e. visible) either -1 (unrefined)
-        //  or an index into splitCells.
+        //- or an index into splitCells.
         const labelList& visibleCells() const
         {
             return visibleCells_;
         }
 
-        //- Storage for splitCell8s.
+        //- Storage for splitCell8s
         const DynamicList<splitCell8>& splitCells() const
         {
             return splitCells_;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
index d7d7b44a1a..e3d0ec431e 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeCells.H
@@ -51,7 +51,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declarations
+// Forward Declarations
 class bitSet;
 class polyMesh;
 class polyTopoChange;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
index 56b698c2a0..20652eb4db 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.H
@@ -51,7 +51,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class face;
@@ -178,6 +178,7 @@ public:
         //  and always merge (if on same patch)
         removeFaces(const polyMesh&, const scalar minCos);
 
+
     // Member Functions
 
         //- Find faces including those with cells which have the same mastercell
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
index 71f6e69238..076e605e9c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
@@ -48,7 +48,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward Declarations
 class polyMesh;
 class polyTopoChange;
 class mapPolyMesh;
@@ -60,8 +60,7 @@ class face;
 
 class removePoints
 {
-
-    // Private data
+    // Private Data
 
         //- Reference to mesh
         const polyMesh& mesh_;
@@ -107,17 +106,17 @@ public:
     // Constructors
 
         //- Construct from mesh
-        removePoints(const polyMesh& mesh, const bool undoable = false);
+        explicit removePoints(const polyMesh& mesh, const bool undoable=false);
 
 
     // Member Functions
 
-            //- If undoable: affected face labels. Already restored faces
-            //  will be -1.
-            const labelList& savedFaceLabels() const
-            {
-                return savedFaceLabels_;
-            }
+        //- If undoable: affected face labels.
+        //- Already restored faces will be -1.
+        const labelList& savedFaceLabels() const
+        {
+            return savedFaceLabels_;
+        }
 
 
         // Helper functions
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
index dbb123cb4b..bbfd221950 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,15 +47,10 @@ SourceFiles
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
+// Forward Declarations
 class polyMesh;
 class mapPolyMesh;
 class polyBoundaryMesh;
-
-
-// Forward declaration of friend functions and operators
-
 class polyTopoChanger;
 
 Ostream& operator<<(Ostream&, const polyTopoChanger&);
@@ -162,7 +157,7 @@ public:
         bool operator==(const polyTopoChanger&) const;
 
 
-    // Ostream operator
+    // Ostream Operator
 
         friend Ostream& operator<<(Ostream&, const polyTopoChanger&);
 };
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
index 58aa3778b5..ebece44115 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,12 +24,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    A mesh which allows changes in the patch distribution of the
-    faces.  The change in patching is set using changePatchID.  For a
-    boundary face, a new patch ID is given.  If the face is internal,
-    it will be added to the first patch and its opposite to the second
-    patch (take care with face orientation!).
+Note
+    If the face is internal, it will be added to the first patch and
+    its opposite to the second patch (take care with face orientation!).
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,7 +39,7 @@ Description
 
 Foam::polyTopoChange& Foam::repatchPolyTopoChanger::meshMod()
 {
-    if (meshModPtr_.empty())
+    if (!meshModPtr_)
     {
         meshModPtr_.reset(new polyTopoChange(mesh_));
     }
@@ -65,14 +63,14 @@ void Foam::repatchPolyTopoChanger::changePatches
     const List<polyPatch*>& patches
 )
 {
-    if (meshModPtr_.valid())
+    if (meshModPtr_)
     {
         FatalErrorInFunction
             << "Cannot change patches after having changed faces. " << nl
             << "Please call changePatches first."
             << exit(FatalError);
     }
-    meshModPtr_.clear();
+    meshModPtr_.reset(nullptr);
     mesh_.removeBoundary();
     mesh_.addPatches(patches);
 }
@@ -269,7 +267,7 @@ void Foam::repatchPolyTopoChanger::repatch()
     meshMod().changeMesh(mesh_, false);
 
     // Clear topo change for the next operation
-    meshModPtr_.clear();
+    meshModPtr_.reset(nullptr);
 }
 
 
diff --git a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
index 8403360961..14c7f0c591 100644
--- a/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
+++ b/src/dynamicMesh/polyTopoChange/repatchPolyTopoChanger/repatchPolyTopoChanger.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,18 +54,18 @@ namespace Foam
 
 class repatchPolyTopoChanger
 {
-    // Private data
+    // Private Data
 
         //- The polyMesh to be repatched
         polyMesh& mesh_;
 
         //- Topological change to accumulated all mesh changes
-        autoPtr<polyTopoChange> meshModPtr_;
+        unique_ptr<polyTopoChange> meshModPtr_;
 
 
     // Private Member Functions
 
-        //- Demand driven access to polyTopoChange
+        //- Demand-driven access to polyTopoChange
         polyTopoChange& meshMod();
 
         //- No copy construct
diff --git a/src/dynamicMesh/setUpdater/setUpdater.C b/src/dynamicMesh/setUpdater/setUpdater.C
index cf3bd9577f..5c93427521 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.C
+++ b/src/dynamicMesh/setUpdater/setUpdater.C
@@ -62,12 +62,6 @@ Foam::setUpdater::setUpdater
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::setUpdater::~setUpdater()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::setUpdater::changeTopology() const
diff --git a/src/dynamicMesh/setUpdater/setUpdater.H b/src/dynamicMesh/setUpdater/setUpdater.H
index b924c26bf5..278d3dc67c 100644
--- a/src/dynamicMesh/setUpdater/setUpdater.H
+++ b/src/dynamicMesh/setUpdater/setUpdater.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -86,7 +87,7 @@ public:
 
 
     //- Destructor
-    virtual ~setUpdater();
+    virtual ~setUpdater() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
index 500eba7ee1..e8e814e321 100644
--- a/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
@@ -42,7 +42,6 @@ License
 #include "polyModifyPoint.H"
 #include "polyModifyFace.H"
 #include "polyRemoveFace.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1886,11 +1885,8 @@ void Foam::slidingInterface::coupleInterface(polyTopoChange& ref) const
     }
 
     // Grab cut face master and slave addressing
-    deleteDemandDrivenData(cutFaceMasterPtr_);
-    cutFaceMasterPtr_ = new labelList(cutPatch.cutFaceMaster());
-
-    deleteDemandDrivenData(cutFaceSlavePtr_);
-    cutFaceSlavePtr_ = new labelList(cutPatch.cutFaceSlave());
+    cutFaceMasterPtr_.reset(new labelList(cutPatch.cutFaceMaster()));
+    cutFaceSlavePtr_.reset(new labelList(cutPatch.cutFaceSlave()));
 
     // Finished coupling
     attached_ = true;
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
index d24cf2de1a..e3b7833bbd 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "enrichedPatch.H"
-#include "demandDrivenData.H"
 #include "OFstream.H"
 #include "meshTools.H"
 
@@ -50,7 +49,7 @@ void Foam::enrichedPatch::calcMeshPoints() const
             << abort(FatalError);
     }
 
-    meshPointsPtr_ = new labelList(pointMap().sortedToc());
+    meshPointsPtr_.reset(new labelList(pointMap().sortedToc()));
 }
 
 
@@ -78,7 +77,7 @@ void Foam::enrichedPatch::calcLocalFaces() const
 
     const faceList& faces = enrichedFaces();
 
-    localFacesPtr_ = new faceList(faces);
+    localFacesPtr_.reset(new faceList(faces));
     auto& locFaces = *localFacesPtr_;
 
     for (face& f : locFaces)
@@ -102,7 +101,7 @@ void Foam::enrichedPatch::calcLocalPoints() const
 
     const labelList& mp = meshPoints();
 
-    localPointsPtr_ = new pointField(mp.size());
+    localPointsPtr_.reset(new pointField(mp.size()));
     auto& locPoints = *localPointsPtr_;
 
     forAll(locPoints, i)
@@ -114,13 +113,13 @@ void Foam::enrichedPatch::calcLocalPoints() const
 
 void Foam::enrichedPatch::clearOut()
 {
-    deleteDemandDrivenData(enrichedFacesPtr_);
+    enrichedFacesPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(meshPointsPtr_);
-    deleteDemandDrivenData(localFacesPtr_);
-    deleteDemandDrivenData(localPointsPtr_);
-    deleteDemandDrivenData(pointPointsPtr_);
-    deleteDemandDrivenData(masterPointFacesPtr_);
+    meshPointsPtr_.reset(nullptr);
+    localFacesPtr_.reset(nullptr);
+    localPointsPtr_.reset(nullptr);
+    pointPointsPtr_.reset(nullptr);
+    masterPointFacesPtr_.reset(nullptr);
 
     clearCutFaces();
 }
@@ -161,14 +160,6 @@ Foam::enrichedPatch::enrichedPatch
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::enrichedPatch::~enrichedPatch()
-{
-    clearOut();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::labelList& Foam::enrichedPatch::meshPoints() const
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
index dd05858fc1..0ed15b67bd 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatch.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +69,7 @@ namespace Foam
 
 class enrichedPatch
 {
-    // Private data
+    // Private Data
 
         //- Reference to master patch
         const primitiveFacePatch& masterPatch_;
@@ -98,38 +99,38 @@ class enrichedPatch
     // Demand-driven private data
 
         //- Enriched patch
-        mutable faceList* enrichedFacesPtr_;
+        mutable unique_ptr<faceList> enrichedFacesPtr_;
 
         //- Mesh points
-        mutable labelList* meshPointsPtr_;
+        mutable unique_ptr<labelList> meshPointsPtr_;
 
         //- Local faces
-        mutable faceList* localFacesPtr_;
+        mutable unique_ptr<faceList> localFacesPtr_;
 
         //- Local points
-        mutable pointField* localPointsPtr_;
+        mutable unique_ptr<pointField> localPointsPtr_;
 
         //- Point-point addressing
-        mutable labelListList* pointPointsPtr_;
+        mutable unique_ptr<labelListList> pointPointsPtr_;
 
         // Master point addressing
-        mutable Map<labelList>* masterPointFacesPtr_;
+        mutable unique_ptr<Map<labelList>> masterPointFacesPtr_;
 
 
         // Cut faces and addressing
 
             //- Cut faces
-            mutable faceList* cutFacesPtr_;
+            mutable unique_ptr<faceList> cutFacesPtr_;
 
             //- Cut face master
             //  - the face on the master patch for internal faces
             //  - the creator face for boundary face
-            mutable labelList* cutFaceMasterPtr_;
+            mutable unique_ptr<labelList> cutFaceMasterPtr_;
 
             //- Cut face slave
             //  - the face on the slave patch for internal faces
             //  - -1 for boundary face
-            mutable labelList* cutFaceSlavePtr_;
+            mutable unique_ptr<labelList> cutFaceSlavePtr_;
 
 
     // Private Member Functions
@@ -173,7 +174,7 @@ class enrichedPatch
             void clearOut();
 
 
-    // Static data members
+    // Static Data Members
 
         //- Estimated ratio of original-to-enriched face size
         static const label enrichedFaceRatio_;
@@ -187,6 +188,7 @@ public:
     // Static data members
     ClassName("enrichedPatch");
 
+
     // Constructors
 
         //- Construct from components
@@ -204,7 +206,7 @@ public:
 
 
     //- Destructor
-    ~enrichedPatch();
+    ~enrichedPatch() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
index 3452c0d4fa..506c17297b 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
@@ -36,7 +36,6 @@ Description
 #include "labelPair.H"
 #include "primitiveMesh.H"
 #include "edgeHashes.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -635,22 +634,17 @@ void Foam::enrichedPatch::calcCutFaces() const
     } // end of local faces
 
     // Re-pack lists into compact storage
-    cutFacesPtr_ = new faceList();
-    cutFacesPtr_->transfer(cf);
-
-    cutFaceMasterPtr_ = new labelList();
-    cutFaceMasterPtr_->transfer(cfMaster);
-
-    cutFaceSlavePtr_ = new labelList();
-    cutFaceSlavePtr_->transfer(cfSlave);
+    cutFacesPtr_.reset(new faceList(std::move(cf)));
+    cutFaceMasterPtr_.reset(new labelList(std::move(cfMaster)));
+    cutFaceSlavePtr_.reset(new labelList(std::move(cfSlave)));
 }
 
 
 void Foam::enrichedPatch::clearCutFaces()
 {
-    deleteDemandDrivenData(cutFacesPtr_);
-    deleteDemandDrivenData(cutFaceMasterPtr_);
-    deleteDemandDrivenData(cutFaceSlavePtr_);
+    cutFacesPtr_.reset(nullptr);
+    cutFaceMasterPtr_.reset(nullptr);
+    cutFaceSlavePtr_.reset(nullptr);
 }
 
 
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
index d6008c25d7..b733af6f2e 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,8 +59,11 @@ void Foam::enrichedPatch::calcEnrichedFaces
     //    the edge; order them in the necessary direction and insert onto the
     //    face.
     // 4) Grab the next point and return on step 2.
-    enrichedFacesPtr_ = new faceList(masterPatch_.size() + slavePatch_.size());
-    faceList& enrichedFaces = *enrichedFacesPtr_;
+    enrichedFacesPtr_.reset
+    (
+        new faceList(masterPatch_.size() + slavePatch_.size())
+    );
+    auto& enrichedFaces = *enrichedFacesPtr_;
 
     label nEnrichedFaces = 0;
 
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
index be71b4d235..966fdfaab4 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchMasterPoints.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,6 @@ License
 
 #include "enrichedPatch.H"
 #include "primitiveMesh.H"
-#include "demandDrivenData.H"
 #include "DynamicList.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -88,8 +87,8 @@ void Foam::enrichedPatch::calcMasterPointFaces() const
 
     // Re-pack dynamic lists into normal lists
 
-    masterPointFacesPtr_ = new Map<labelList>(2*mpf.size());
-    Map<labelList>& masterPointFaceMap = *masterPointFacesPtr_;
+    masterPointFacesPtr_.reset(new Map<labelList>(2*mpf.size()));
+    auto& masterPointFaceMap = *masterPointFacesPtr_;
 
     forAllIters(mpf, mpfIter)
     {
diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
index 4f17aecfa1..bd0736cbe4 100644
--- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
+++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchPointPoints.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,8 +75,8 @@ void Foam::enrichedPatch::calcPointPoints() const
     }
 
     // Re-pack the list
-    pointPointsPtr_ = new labelListList(pp.size());
-    labelListList& ppAddr = *pointPointsPtr_;
+    pointPointsPtr_.reset(new labelListList(pp.size()));
+    auto& ppAddr = *pointPointsPtr_;
 
     forAll(pp, pointi)
     {
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.C b/src/dynamicMesh/slidingInterface/slidingInterface.C
index d674a6bd90..23645166cd 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.C
@@ -32,7 +32,6 @@ License
 #include "polyTopoChange.H"
 #include "addToRunTimeSelectionTable.H"
 #include "plane.H"
-#include "demandDrivenData.H"
 
 // Index of debug signs:
 // p - adjusting a projection point
@@ -285,17 +284,19 @@ Foam::slidingInterface::slidingInterface
         }
 
         // The face zone addressing is written out in the definition dictionary
-        masterFaceCellsPtr_ = new labelList(dict.lookup("masterFaceCells"));
-        slaveFaceCellsPtr_ = new labelList(dict.lookup("slaveFaceCells"));
+        masterFaceCellsPtr_.reset(new labelList{});
+        slaveFaceCellsPtr_.reset(new labelList{});
+        masterStickOutFacesPtr_.reset(new labelList{});
+        slaveStickOutFacesPtr_.reset(new labelList{});
+        retiredPointMapPtr_.reset(new Map<label>{});
+        cutPointEdgePairMapPtr_.reset(new Map<Pair<edge>>{});
 
-        masterStickOutFacesPtr_ =
-            new labelList(dict.lookup("masterStickOutFaces"));
-        slaveStickOutFacesPtr_ =
-            new labelList(dict.lookup("slaveStickOutFaces"));
-
-        retiredPointMapPtr_ = new Map<label>(dict.lookup("retiredPointMap"));
-        cutPointEdgePairMapPtr_ =
-            new Map<Pair<edge>>(dict.lookup("cutPointEdgePairMap"));
+        dict.readEntry("masterFaceCells", *masterFaceCellsPtr_);
+        dict.readEntry("slaveFaceCells", *slaveFaceCellsPtr_);
+        dict.readEntry("masterStickOutFaces", *masterStickOutFacesPtr_);
+        dict.readEntry("slaveStickOutFaces", *slaveStickOutFacesPtr_);
+        dict.readEntry("retiredPointMap", *retiredPointMapPtr_);
+        dict.readEntry("cutPointEdgePairMap", *cutPointEdgePairMapPtr_);
     }
     else
     {
@@ -304,23 +305,15 @@ Foam::slidingInterface::slidingInterface
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::slidingInterface::~slidingInterface()
-{
-    clearOut();
-}
-
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::slidingInterface::clearAddressing() const
 {
-    deleteDemandDrivenData(cutFaceMasterPtr_);
-    deleteDemandDrivenData(cutFaceSlavePtr_);
+    cutFaceMasterPtr_.reset(nullptr);
+    cutFaceSlavePtr_.reset(nullptr);
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
 const Foam::faceZoneID& Foam::slidingInterface::masterFaceZoneID() const
 {
     return masterFaceZoneID_;
@@ -680,6 +673,7 @@ const Foam::pointField& Foam::slidingInterface::pointProjection() const
     return *projectedSlavePointsPtr_;
 }
 
+
 void Foam::slidingInterface::setTolerances(const dictionary&dict, bool report)
 {
     pointMergeTol_ = dict.lookupOrDefault<scalar>
diff --git a/src/dynamicMesh/slidingInterface/slidingInterface.H b/src/dynamicMesh/slidingInterface/slidingInterface.H
index 1df3425fe5..f4ffa5e14e 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterface.H
+++ b/src/dynamicMesh/slidingInterface/slidingInterface.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,7 +78,7 @@ class slidingInterface
 {
 public:
 
-    // Public enumerations
+    // Public Enumerations
 
         //- Type of match
         enum typeOfMatch
@@ -91,7 +92,7 @@ public:
 
 private:
 
-    // Private data
+    // Private Data
 
         //- Master face zone ID
         faceZoneID masterFaceZoneID_;
@@ -160,53 +161,53 @@ private:
             //- Cut face master face.  Gives the index of face in master patch
             //  the cut face has been created from.  For a slave-only face
             //  this will be -1
-            mutable labelList* cutFaceMasterPtr_;
+            mutable unique_ptr<labelList> cutFaceMasterPtr_;
 
             //- Cut face slave face.  Gives the index of face in slave patch
             //  the cut face has been created from.  For a master-only face
             //  this will be -1
-            mutable labelList* cutFaceSlavePtr_;
+            mutable unique_ptr<labelList> cutFaceSlavePtr_;
 
             //- Master zone faceCells
-            mutable labelList* masterFaceCellsPtr_;
+            mutable unique_ptr<labelList> masterFaceCellsPtr_;
 
             //- Slave zone faceCells
-            mutable labelList* slaveFaceCellsPtr_;
+            mutable unique_ptr<labelList> slaveFaceCellsPtr_;
 
             //- Master stick-out faces
-            mutable labelList* masterStickOutFacesPtr_;
+            mutable unique_ptr<labelList> masterStickOutFacesPtr_;
 
             //- Slave stick-out faces
-            mutable labelList* slaveStickOutFacesPtr_;
+            mutable unique_ptr<labelList> slaveStickOutFacesPtr_;
 
             //- Retired point mapping.
             //  For every retired slave side point, gives the label of the
             //  master point that replaces it
-            mutable Map<label>* retiredPointMapPtr_;
+            mutable unique_ptr<Map<label>> retiredPointMapPtr_;
 
             //- Cut edge pairs
             //  For cut points created by intersection two edges,
             //  store the master-slave edge pair used in creation
-            mutable Map<Pair<edge>>* cutPointEdgePairMapPtr_;
+            mutable unique_ptr<Map<Pair<edge>>> cutPointEdgePairMapPtr_;
 
             //- Slave point hit.  The index of master point hit by the
             //  slave point in projection.  For no point hit, set to -1
-            mutable labelList* slavePointPointHitsPtr_;
+            mutable unique_ptr<labelList> slavePointPointHitsPtr_;
 
             //- Slave edge hit.  The index of master edge hit by the
             //  slave point in projection.  For point or no edge  hit, set to -1
-            mutable labelList* slavePointEdgeHitsPtr_;
+            mutable unique_ptr<labelList> slavePointEdgeHitsPtr_;
 
             //- Slave face hit.  The index of master face hit by the
             //  slave point in projection.
-            mutable List<objectHit>* slavePointFaceHitsPtr_;
+            mutable unique_ptr<List<objectHit>> slavePointFaceHitsPtr_;
 
             //- Master point edge hit.  The index of slave edge hit by
             //  a master point.  For no hit set to -1
-            mutable labelList* masterPointEdgeHitsPtr_;
+            mutable unique_ptr<labelList> masterPointEdgeHitsPtr_;
 
             //- Projected slave points
-            mutable pointField* projectedSlavePointsPtr_;
+            mutable unique_ptr<pointField> projectedSlavePointsPtr_;
 
 
     // Private Member Functions
@@ -254,8 +255,8 @@ private:
             //- Cut point edge pair map
             const Map<Pair<edge>>& cutPointEdgePairMap() const;
 
-             //- Clear addressing
-             void clearAddressing() const;
+            //- Clear addressing
+            void clearAddressing() const;
 
             //- Project slave points and compare with the current projection.
             //  If the projection has changed, the sliding interface
@@ -341,7 +342,7 @@ public:
 
 
     //- Destructor
-    virtual ~slidingInterface();
+    virtual ~slidingInterface() = default;
 
 
     // Member Functions
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
index cb9429a18c..1015e60c58 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceAttachedAddressing.C
@@ -65,8 +65,8 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         const boolList& masterFlip =
             faceZones[masterFaceZoneID_.index()].flipMap();
 
-        masterFaceCellsPtr_ = new labelList(masterPatchFaces.size());
-        labelList& mfc = *masterFaceCellsPtr_;
+        masterFaceCellsPtr_.reset(new labelList(masterPatchFaces.size()));
+        auto& mfc = *masterFaceCellsPtr_;
 
         forAll(masterPatchFaces, facei)
         {
@@ -91,8 +91,8 @@ void Foam::slidingInterface::calcAttachedAddressing() const
         const boolList& slaveFlip =
             faceZones[slaveFaceZoneID_.index()].flipMap();
 
-        slaveFaceCellsPtr_ = new labelList(slavePatchFaces.size());
-        labelList& sfc = *slaveFaceCellsPtr_;
+        slaveFaceCellsPtr_.reset(new labelList(slavePatchFaces.size()));
+        auto& sfc = *slaveFaceCellsPtr_;
 
         forAll(slavePatchFaces, facei)
         {
@@ -174,15 +174,12 @@ void Foam::slidingInterface::calcAttachedAddressing() const
             }
         }
 
+        masterStickOutFacesPtr_.reset(new labelList(stickOutFaceMap.toc()));
+
         // Sort in debug mode for easier diagnostics
         if (debug)
         {
-            masterStickOutFacesPtr_ =
-                new labelList(stickOutFaceMap.sortedToc());
-        }
-        else
-        {
-            masterStickOutFacesPtr_ = new labelList(stickOutFaceMap.toc());
+            Foam::sort(*masterStickOutFacesPtr_);
         }
 
         // Slave side
@@ -209,33 +206,34 @@ void Foam::slidingInterface::calcAttachedAddressing() const
             }
         }
 
+        slaveStickOutFacesPtr_.reset(new labelList(stickOutFaceMap.toc()));
+
         // Sort in debug mode for easier diagnostics
         if (debug)
         {
-            slaveStickOutFacesPtr_ =
-                new labelList(stickOutFaceMap.sortedToc());
-        }
-        else
-        {
-            slaveStickOutFacesPtr_ = new labelList(stickOutFaceMap.toc());
+            Foam::sort(*slaveStickOutFacesPtr_);
         }
 
         stickOutFaceMap.clear();
 
         // Retired point addressing does not exist at this stage.
         // It will be filled when the interface is coupled.
-        retiredPointMapPtr_ =
+        retiredPointMapPtr_.reset
+        (
             new Map<label>
             (
                 2*faceZones[slaveFaceZoneID_.index()]().nPoints()
-            );
+            )
+        );
 
         // Ditto for cut point edge map.  This is a rough guess of its size
-        cutPointEdgePairMapPtr_ =
+        cutPointEdgePairMapPtr_.reset
+        (
             new Map<Pair<edge>>
             (
                 faceZones[slaveFaceZoneID_.index()]().nEdges()
-            );
+            )
+        );
     }
     else
     {
@@ -256,14 +254,14 @@ void Foam::slidingInterface::calcAttachedAddressing() const
 
 void Foam::slidingInterface::clearAttachedAddressing() const
 {
-    deleteDemandDrivenData(masterFaceCellsPtr_);
-    deleteDemandDrivenData(slaveFaceCellsPtr_);
+    masterFaceCellsPtr_.reset(nullptr);
+    slaveFaceCellsPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(masterStickOutFacesPtr_);
-    deleteDemandDrivenData(slaveStickOutFacesPtr_);
+    masterStickOutFacesPtr_.reset(nullptr);
+    slaveStickOutFacesPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(retiredPointMapPtr_);
-    deleteDemandDrivenData(cutPointEdgePairMapPtr_);
+    retiredPointMapPtr_.reset(nullptr);
+    cutPointEdgePairMapPtr_.reset(nullptr);
 }
 
 
@@ -281,8 +279,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     const labelList& sfc = slaveFaceCells();
 
     // Master side
-    labelList* newMfcPtr = new labelList(mfc.size(), -1);
-    labelList& newMfc = *newMfcPtr;
+    unique_ptr<labelList> newMfcPtr(new labelList(mfc.size(), -1));
+    auto& newMfc = *newMfcPtr;
 
     const labelList& mfzRenumber =
         m.faceZoneFaceMap()[masterFaceZoneID_.index()];
@@ -298,8 +296,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     }
 
     // Slave side
-    labelList* newSfcPtr = new labelList(sfc.size(), -1);
-    labelList& newSfc = *newSfcPtr;
+    unique_ptr<labelList> newSfcPtr(new labelList(sfc.size(), -1));
+    auto& newSfc = *newSfcPtr;
 
     const labelList& sfzRenumber =
         m.faceZoneFaceMap()[slaveFaceZoneID_.index()];
@@ -334,8 +332,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Master side
     const labelList& msof = masterStickOutFaces();
 
-    labelList* newMsofPtr = new labelList(msof.size(), -1);
-    labelList& newMsof = *newMsofPtr;
+    unique_ptr<labelList> newMsofPtr(new labelList(msof.size(), -1));
+    auto& newMsof = *newMsofPtr;
 
     forAll(msof, facei)
     {
@@ -350,8 +348,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Slave side
     const labelList& ssof = slaveStickOutFaces();
 
-    labelList* newSsofPtr = new labelList(ssof.size(), -1);
-    labelList& newSsof = *newSsofPtr;
+    unique_ptr<labelList> newSsofPtr(new labelList(ssof.size(), -1));
+    auto& newSsof = *newSsofPtr;
 
     forAll(ssof, facei)
     {
@@ -379,8 +377,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Renumber the retired point map. Need to take a copy!
     const Map<label> rpm = retiredPointMap();
 
-    Map<label>* newRpmPtr = new Map<label>(rpm.size());
-    Map<label>& newRpm = *newRpmPtr;
+    unique_ptr<Map<label>> newRpmPtr(new Map<label>(rpm.size()));
+    auto& newRpm = *newRpmPtr;
 
     // Get reference to point renumbering
     const labelList& reversePointMap = m.reversePointMap();
@@ -409,8 +407,8 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Renumber the cut point edge pair map. Need to take a copy!
     const Map<Pair<edge>> cpepm = cutPointEdgePairMap();
 
-    Map<Pair<edge>>* newCpepmPtr = new Map<Pair<edge>>(cpepm.size());
-    Map<Pair<edge>>& newCpepm = *newCpepmPtr;
+    unique_ptr<Map<Pair<edge>>> newCpepmPtr(new Map<Pair<edge>>(cpepm.size()));
+    auto& newCpepm = *newCpepmPtr;
 
     forAllConstIters(cpepm, iter)
     {
@@ -450,11 +448,11 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Renumber the projected slave zone points
     const pointField& projectedSlavePoints = *projectedSlavePointsPtr_;
 
-    pointField* newProjectedSlavePointsPtr
+    unique_ptr<pointField> newProjectedSlavePointsPtr
     (
         new pointField(projectedSlavePoints.size())
     );
-    pointField& newProjectedSlavePoints = *newProjectedSlavePointsPtr;
+    auto& newProjectedSlavePoints = *newProjectedSlavePointsPtr;
 
     const labelList& sfzPointRenumber =
         m.faceZonePointMap()[slaveFaceZoneID_.index()];
@@ -471,17 +469,17 @@ void Foam::slidingInterface::renumberAttachedAddressing
     // Re-set the lists
     clearAttachedAddressing();
 
-    deleteDemandDrivenData(projectedSlavePointsPtr_);
+    projectedSlavePointsPtr_.reset(nullptr);
 
-    masterFaceCellsPtr_ = newMfcPtr;
-    slaveFaceCellsPtr_ = newSfcPtr;
+    masterFaceCellsPtr_ = std::move(newMfcPtr);
+    slaveFaceCellsPtr_ = std::move(newSfcPtr);
 
-    masterStickOutFacesPtr_ = newMsofPtr;
-    slaveStickOutFacesPtr_ = newSsofPtr;
+    masterStickOutFacesPtr_ = std::move(newMsofPtr);
+    slaveStickOutFacesPtr_ = std::move(newSsofPtr);
 
-    retiredPointMapPtr_ = newRpmPtr;
-    cutPointEdgePairMapPtr_ = newCpepmPtr;
-    projectedSlavePointsPtr_ = newProjectedSlavePointsPtr;
+    retiredPointMapPtr_ = std::move(newRpmPtr);
+    cutPointEdgePairMapPtr_ = std::move(newCpepmPtr);
+    projectedSlavePointsPtr_ = std::move(newProjectedSlavePointsPtr);
 }
 
 
diff --git a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
index f671b2999e..f52f6b4a1a 100644
--- a/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
+++ b/src/dynamicMesh/slidingInterface/slidingInterfaceProjectPoints.C
@@ -30,7 +30,6 @@ License
 #include "polyMesh.H"
 #include "line.H"
 #include "polyTopoChanger.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -239,10 +238,11 @@ bool Foam::slidingInterface::projectPoints() const
     }
 
     // Projected slave points are stored for mesh motion correction
-    deleteDemandDrivenData(projectedSlavePointsPtr_);
-    projectedSlavePointsPtr_ =
-        new pointField(slavePointFaceHits.size(), Zero);
-    pointField& projectedSlavePoints = *projectedSlavePointsPtr_;
+    projectedSlavePointsPtr_.reset
+    (
+        new pointField(slavePointFaceHits.size(), Zero)
+    );
+    auto& projectedSlavePoints = *projectedSlavePointsPtr_;
 
     // Adjust projection to type of match
 
@@ -1082,21 +1082,22 @@ bool Foam::slidingInterface::projectPoints() const
         trigger_ = true;
 
         // Store the addressing arrays and projected points
-        deleteDemandDrivenData(slavePointPointHitsPtr_);
-        slavePointPointHitsPtr_ = new labelList();
-        slavePointPointHitsPtr_->transfer(slavePointPointHits);
-
-        deleteDemandDrivenData(slavePointEdgeHitsPtr_);
-        slavePointEdgeHitsPtr_ = new labelList();
-        slavePointEdgeHitsPtr_->transfer(slavePointEdgeHits);
-
-        deleteDemandDrivenData(slavePointFaceHitsPtr_);
-        slavePointFaceHitsPtr_ = new List<objectHit>();
-        slavePointFaceHitsPtr_->transfer(slavePointFaceHits);
-
-        deleteDemandDrivenData(masterPointEdgeHitsPtr_);
-        masterPointEdgeHitsPtr_ = new labelList();
-        masterPointEdgeHitsPtr_->transfer(masterPointEdgeHits);
+        slavePointPointHitsPtr_.reset
+        (
+            new labelList(std::move(slavePointPointHits))
+        );
+        slavePointEdgeHitsPtr_.reset
+        (
+            new labelList(std::move(slavePointEdgeHits))
+        );
+        slavePointFaceHitsPtr_.reset
+        (
+            new List<objectHit>(std::move(slavePointFaceHits))
+        );
+        masterPointEdgeHitsPtr_.reset
+        (
+            new labelList(std::move(masterPointEdgeHits))
+        );
 
         if (debug)
         {
@@ -1118,21 +1119,22 @@ bool Foam::slidingInterface::projectPoints() const
         )
         {
             // Must be restart.  Force topological change.
-            deleteDemandDrivenData(slavePointPointHitsPtr_);
-            slavePointPointHitsPtr_ = new labelList();
-            slavePointPointHitsPtr_->transfer(slavePointPointHits);
-
-            deleteDemandDrivenData(slavePointEdgeHitsPtr_);
-            slavePointEdgeHitsPtr_ = new labelList();
-            slavePointEdgeHitsPtr_->transfer(slavePointEdgeHits);
-
-            deleteDemandDrivenData(slavePointFaceHitsPtr_);
-            slavePointFaceHitsPtr_ = new List<objectHit>();
-            slavePointFaceHitsPtr_->transfer(slavePointFaceHits);
-
-            deleteDemandDrivenData(masterPointEdgeHitsPtr_);
-            masterPointEdgeHitsPtr_ = new labelList();
-            masterPointEdgeHitsPtr_->transfer(masterPointEdgeHits);
+            slavePointPointHitsPtr_.reset
+            (
+                new labelList(slavePointPointHits)
+            );
+            slavePointEdgeHitsPtr_.reset
+            (
+                new labelList(std::move(slavePointEdgeHits))
+            );
+            slavePointFaceHitsPtr_.reset
+            (
+                new List<objectHit>(std::move(slavePointFaceHits))
+            );
+            masterPointEdgeHitsPtr_.reset
+            (
+                new labelList(std::move(masterPointEdgeHits))
+            );
 
             if (debug)
             {
@@ -1143,7 +1145,7 @@ bool Foam::slidingInterface::projectPoints() const
             return trigger_;
         }
 
-        if (slavePointPointHits != (*slavePointPointHitsPtr_))
+        if (slavePointPointHits != *slavePointPointHitsPtr_)
         {
             if (debug)
             {
@@ -1153,7 +1155,7 @@ bool Foam::slidingInterface::projectPoints() const
             trigger_ = true;
         }
 
-        if (slavePointEdgeHits != (*slavePointEdgeHitsPtr_))
+        if (slavePointEdgeHits != *slavePointEdgeHitsPtr_)
         {
             if (debug)
             {
@@ -1198,7 +1200,7 @@ bool Foam::slidingInterface::projectPoints() const
 
         }
 
-        if (masterPointEdgeHits != (*masterPointEdgeHitsPtr_))
+        if (masterPointEdgeHits != *masterPointEdgeHitsPtr_)
         {
             if (debug)
             {
@@ -1212,21 +1214,22 @@ bool Foam::slidingInterface::projectPoints() const
         if (trigger_)
         {
             // Grab new data
-            deleteDemandDrivenData(slavePointPointHitsPtr_);
-            slavePointPointHitsPtr_ = new labelList();
-            slavePointPointHitsPtr_->transfer(slavePointPointHits);
-
-            deleteDemandDrivenData(slavePointEdgeHitsPtr_);
-            slavePointEdgeHitsPtr_ = new labelList();
-            slavePointEdgeHitsPtr_->transfer(slavePointEdgeHits);
-
-            deleteDemandDrivenData(slavePointFaceHitsPtr_);
-            slavePointFaceHitsPtr_ = new List<objectHit>();
-            slavePointFaceHitsPtr_->transfer(slavePointFaceHits);
-
-            deleteDemandDrivenData(masterPointEdgeHitsPtr_);
-            masterPointEdgeHitsPtr_ = new labelList();
-            masterPointEdgeHitsPtr_->transfer(masterPointEdgeHits);
+            slavePointPointHitsPtr_.reset
+            (
+                new labelList(std::move(slavePointPointHits))
+            );
+            slavePointEdgeHitsPtr_.reset
+            (
+                new labelList(std::move(slavePointEdgeHits))
+            );
+            slavePointFaceHitsPtr_.reset
+            (
+                new List<objectHit>(std::move(slavePointFaceHits))
+            );
+            masterPointEdgeHitsPtr_.reset
+            (
+                new labelList(std::move(masterPointEdgeHits))
+            );
 
             if (debug)
             {
@@ -1248,12 +1251,12 @@ bool Foam::slidingInterface::projectPoints() const
 
 void Foam::slidingInterface::clearPointProjection() const
 {
-    deleteDemandDrivenData(slavePointPointHitsPtr_);
-    deleteDemandDrivenData(slavePointEdgeHitsPtr_);
-    deleteDemandDrivenData(slavePointFaceHitsPtr_);
-    deleteDemandDrivenData(masterPointEdgeHitsPtr_);
+    slavePointPointHitsPtr_.reset(nullptr);
+    slavePointEdgeHitsPtr_.reset(nullptr);
+    slavePointFaceHitsPtr_.reset(nullptr);
+    masterPointEdgeHitsPtr_.reset(nullptr);
 
-    deleteDemandDrivenData(projectedSlavePointsPtr_);
+    projectedSlavePointsPtr_.reset(nullptr);
 }