diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
index 93ecdc30fa..86fa867a63 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.C
@@ -63,15 +63,8 @@ Foam::surfaceFeaturesExtraction::extractFromFile::extractFromFile
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::surfaceFeaturesExtraction::extractFromFile::~extractFromFile()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 Foam::autoPtr<Foam::surfaceFeatures>
 Foam::surfaceFeaturesExtraction::extractFromFile::features
 (
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.H b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.H
index b3d54f5ce6..f0e8661acc 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromFile.H
@@ -67,14 +67,10 @@ public:
     extractFromFile(const dictionary& dict);
 
     //- Destructor
-    virtual ~extractFromFile();
+    virtual ~extractFromFile() = default;
 
     //- Features loaded (extracted) from featureEdgeFile
-    virtual autoPtr<surfaceFeatures> features
-    (
-        const triSurface& surf
-    ) const override;
-
+    autoPtr<surfaceFeatures> features(const triSurface& surf) const override;
 };
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
index f20a89dd42..36eda167d7 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.C
@@ -61,12 +61,6 @@ Foam::surfaceFeaturesExtraction::extractFromNone::extractFromNone
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::surfaceFeaturesExtraction::extractFromNone::~extractFromNone()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::surfaceFeatures>
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.H b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.H
index 935e58ef45..d1f7a45c58 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromNone.H
@@ -58,22 +58,16 @@ class extractFromNone
 :
     public method
 {
-
 public:
 
     //- Construct from dictionary
-    extractFromNone(const dictionary& dict);
+    explicit extractFromNone(const dictionary& dict);
 
     //- Destructor
-    virtual ~extractFromNone();
+    virtual ~extractFromNone() = default;
 
     //- Extracted features from surface (no-op)
-    virtual autoPtr<surfaceFeatures> features
-    (
-        const triSurface& surf
-    ) const override;
-
-
+    autoPtr<surfaceFeatures> features(const triSurface& surf) const override;
 };
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
index 084c10a3ca..bb127b6bf8 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.C
@@ -62,15 +62,8 @@ Foam::surfaceFeaturesExtraction::extractFromSurface::extractFromSurface
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::surfaceFeaturesExtraction::extractFromSurface::~extractFromSurface()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 Foam::autoPtr<Foam::surfaceFeatures>
 Foam::surfaceFeaturesExtraction::extractFromSurface::features
 (
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.H b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.H
index bf6c7d4683..c8e84d08ed 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/extractFromSurface.H
@@ -65,14 +65,10 @@ public:
     extractFromSurface(const dictionary& dict);
 
     //- Destructor
-    virtual ~extractFromSurface();
+    virtual ~extractFromSurface() = default;
 
     //- Features extracted from surface
-    virtual autoPtr<surfaceFeatures> features
-    (
-        const triSurface& surf
-    ) const override;
-
+    autoPtr<surfaceFeatures> features(const triSurface& surf) const override;
 };
 
 
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C
index b5723df239..ce45e4c250 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C
@@ -56,10 +56,14 @@ Foam::surfaceFeaturesExtraction::method::method()
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::surfaceFeaturesExtraction::method::~method()
-{}
+Foam::surfaceFeaturesExtraction::method::method(const dictionary& dict)
+:
+    includedAngle_(0),
+    geometricTestOnly_(Switch::NO)
+{
+    dict.readIfPresent("includedAngle", includedAngle_);
+    dict.readIfPresent("geometricTestOnly", geometricTestOnly_);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.H b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.H
index 7a9df17975..8da4e01356 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.H
@@ -66,7 +66,7 @@ protected:
     scalar includedAngle_;
     Switch geometricTestOnly_;
 
-    //- Construct null
+    //- Default construct
     method();
 
 
@@ -79,7 +79,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        method(const dictionary& dict);
+        explicit method(const dictionary& dict);
 
 
     // Declare run-time constructor selection table
@@ -98,36 +98,26 @@ public:
     // Selectors
 
         //- Select constructed from dictionary
-        static autoPtr<method> New
-        (
-            const dictionary& dict
-        );
+        static autoPtr<method> New(const dictionary& dict);
 
 
     //- Destructor
-    virtual ~method();
+    virtual ~method() = default;
 
 
     // Member Functions
 
         //- The included angle, if set
-        inline scalar includedAngle() const
-        {
-            return includedAngle_;
-        }
+        scalar includedAngle() const noexcept { return includedAngle_; }
 
         //- Use geometric test only
-        inline Switch geometricTestOnly() const
-        {
-            return geometricTestOnly_;
-        }
+        Switch geometricTestOnly() const noexcept { return geometricTestOnly_; }
 
         //- Extracted features
         virtual autoPtr<surfaceFeatures> features
         (
             const triSurface& surf
         ) const = 0;
-
 };