diff --git a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
index 14af1b9e48472ade3f43611e78cbd320a9489455..c637c7b4f7e6de70fa803347d19be954e9a6b993 100644
--- a/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
+++ b/etc/caseDicts/surface/surfaceFeatureExtractDict.cfg
@@ -16,11 +16,9 @@ FoamFile
 
 extractionMethod     extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    includedAngle    150;
-    geometricTestOnly no;
-}
+includedAngle        150;
+
+geometricTestOnly    no;
 
 subsetFeatures
 {
diff --git a/etc/templates/closedVolume/system/surfaceFeatureExtractDict b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/closedVolume/system/surfaceFeatureExtractDict
+++ b/etc/templates/closedVolume/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/compressibleInflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
index ba8a72f5d04240011e0189af266e5a3cdc9ae67b..a2642e67a3807acf7fb23398c3b20ada5c940b64 100644
--- a/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
+++ b/etc/templates/inflowOutflow/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ CAD.obj
 {
     extractionMethod     extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle    150;
-    }
+    includedAngle        150;
 
     subsetFeatures
     {
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
index 79c100551c67cb5e50c84eaef8f19d8b03c86907..a4395abc9dadfb5ed97df4b19e5ef80a7883ebe6 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/system/surfaceFeatureExtractDictDefaults
@@ -16,10 +16,8 @@ FoamFile
 
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    includedAngle   150;  // Identifes a feature when angle
-}                         // between faces < includedAngle
+includedAngle       150;  // Identifes a feature when angle
+                          // between faces < includedAngle
 
 trimFeatures
 {
diff --git a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
index e3aa1a2c222f5e38b95ed23eead0271ce69c3428..5490c672cbc5958d86c341b4845d7fc2a915d468 100644
--- a/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
+++ b/tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ walls.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ walls.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index e5001e59464388310b8c520a130592753459a37a..50f950de252ed90fd97e9335091fa8c6e6a2e758 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -18,17 +18,15 @@ geom.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
+
     // Write features to obj format for postprocessing
     writeObj                yes;
 }
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae69251d62c223ced2f827f90a1f628f2f6..459fbbdc8f257193663afaeeb609cd5c4c31b0eb 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
 // How to obtain raw features (extractFromFile || extractFromSurface)
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    // Mark edges whose adjacent surface normals are at an angle less
-    // than includedAngle as features
-    // - 0  : selects no edges
-    // - 180: selects all edges
-    includedAngle   150;
-}
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+includedAngle       150;
+
 
 trimFeatures
 {
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
index 7c81e11aa4d4e398b389e429aeb5e9ee0e5520f5..49ee29f401131590919865b95674706fe2d842ea 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/surfaceFeatureExtractDict
@@ -18,16 +18,13 @@ boundaryAndFaceZones.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (porosityFaces);
 
     // Write options
 
-        writeObj        no; //yes;
+    writeObj            no; //yes;
 }
 
 
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..5f2fcf61602c3784d4568b4110470d099d527700 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
index 81c52e08cbaae095dbb5c67b86d2cac4ddf48b55..ef114df0074339d3bc049d5bf9c54a6f7a9718c8 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/system/surfaceFeatureExtractDict
@@ -18,10 +18,7 @@ shaftRotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   100;
-    }
+    includedAngle       100;
 
     subsetFeatures
     {
@@ -30,19 +27,15 @@ shaftRotating.stl
     }
 
     // Write options
-
-        writeObj        yes;
+    writeObj            yes;
 }
 
 
 vessel.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -55,8 +48,7 @@ vessel.stl
     }
 
     // Write options
-
-        writeObj            no;
+    writeObj            no;
 }
 
 
@@ -64,14 +56,10 @@ spargerInlet.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -79,14 +67,10 @@ stirrer.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -94,16 +78,12 @@ stirrer_baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (stirrer);
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
@@ -111,16 +91,12 @@ rotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (MRF);
 
     // Write options
-
-        writeObj        yes;
+    writeObj            yes;
 }
 
 
@@ -128,16 +104,12 @@ baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     baffles (baffles);
 
     // Write options
-
-        writeObj        no;
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
index 3de3952127d353e2e84f5ce632b34430feb26e3f..1adbed4d4258fd53bd88372d30d93e284b6a8366 100644
--- a/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/OpenCFD/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+
 opencfd_text.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -44,23 +43,16 @@ opencfd_text.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj            no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
 opencfd_box.stl
 {
-    extractionMethod        extractFromSurface;
+    extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle       120;
-    }
+    includedAngle       120;
 
     subsetFeatures
     {
@@ -79,8 +71,8 @@ opencfd_box.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj            no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
index 92e26dfb6a04f70799fedb99f41cb4a25f2ad2fb..dbc8c8c9140bbcad6412e531543c15d930b26e94 100644
--- a/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/jaggedBoundary/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ jaggedBoundary.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   175;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       175;
 
     subsetFeatures
     {
@@ -44,8 +41,8 @@ jaggedBoundary.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 
diff --git a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
index c8ef75f519a3eb5023cf13e7b5c08a67332f4d01..08e6cceabd505e28cce506578b725b2da1fd5f63 100644
--- a/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/foamyQuadMesh/square/system/surfaceFeatureExtractDict
@@ -18,14 +18,11 @@ unit_cube.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   175;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       175;
 
     subsetFeatures
     {
@@ -44,8 +41,8 @@ unit_cube.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
index e8e85fa1282853e9c67cd918a749af1c74847bd9..3a51068dd6c4410a256c998e6563687de5d6b0d0 100644
--- a/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
+++ b/tutorials/mesh/snappyHexMesh/flange/system/surfaceFeatureExtractDict
@@ -19,19 +19,16 @@ flange.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247dac36831d106d4141246b8a9600ea248..af90271dddb4461b59284ae8372b8fb551032017 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ DTC-scaled.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
index ec1a7aa4e52727c9a69dce333825d5e114ffca9b..55ed0f7aec17e99c9b3275d04e1d46d2643b4ec4 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/mixerVesselAMI/system/surfaceFeatureExtractDict
@@ -14,24 +14,23 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+
 vessel.stl
 {
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   120;
-    }
+    includedAngle       120;
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                no;
+    // Write features to obj format for postprocessing
+    writeObj            no;
 }
 
 gasInlet.stl
@@ -39,36 +38,27 @@ gasInlet.stl
 
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 stirrer.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 outlet.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 /*
@@ -76,36 +66,27 @@ baffles.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 rotating.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 
 sparger.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        includedAngle   120;
-    }
+    includedAngle       120;
 
-    writeObj                no;
+    writeObj            no;
 }
 */
 
diff --git a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..5f2fcf61602c3784d4568b4110470d099d527700 100644
--- a/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interDyMFoam/RAS/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
index 0ae80247dac36831d106d4141246b8a9600ea248..af90271dddb4461b59284ae8372b8fb551032017 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/surfaceFeatureExtractDict
@@ -19,14 +19,11 @@ DTC-scaled.stl
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0  : selects no edges
+    // - 180: selects all edges
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +37,8 @@ DTC-scaled.stl
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
index 52258ae69251d62c223ced2f827f90a1f628f2f6..0f429323e0a371cd00448925fbf953719387b4d2 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/system/surfaceFeatureExtractDictDefaults
@@ -1,14 +1,12 @@
 // How to obtain raw features (extractFromFile || extractFromSurface)
 extractionMethod    extractFromSurface;
 
-extractFromSurfaceCoeffs
-{
-    // Mark edges whose adjacent surface normals are at an angle less
-    // than includedAngle as features
-    // - 0  : selects no edges
-    // - 180: selects all edges
-    includedAngle   150;
-}
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0  : selects no edges
+// - 180: selects all edges
+includedAngle       150;
 
 trimFeatures
 {
diff --git a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
index 54e009ccfa83fea14941c9239b0743dd36bbdfa3..dc2ea8b2342fc6188f930e904aac3b3dc23166b1 100644
--- a/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/motorBike/system/surfaceFeatureExtractDict
@@ -19,14 +19,12 @@ motorBike.obj
     // How to obtain raw features (extractFromFile || extractFromSurface)
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    // Mark edges whose adjacent surface normals are at an angle less
+    // than includedAngle as features
+    // - 0   : selects no edges
+    // - 180 : selects all edges
+
+    includedAngle       150;
 
     subsetFeatures
     {
@@ -40,8 +38,8 @@ motorBike.obj
 
     // Write options
 
-        // Write features to obj format for postprocessing
-        writeObj                yes;
+    // Write features to obj format for postprocessing
+    writeObj            yes;
 }
 
 
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
index ffeafc363fb361c27158b0ab36e3d20e07fbbad3..b0aef956f790d8a2acdb3225e4df72eb500d6353 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/surfaceFeatureExtractDict
@@ -14,18 +14,17 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// includedAngle:
+// Mark edges whose adjacent surface normals are at an angle less
+// than includedAngle as features
+// - 0   : selects no edges
+// - 180 : selects all edges
+
 bottomAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -34,14 +33,7 @@ heater.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -50,14 +42,7 @@ leftSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -66,14 +51,7 @@ rightSolid.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;
@@ -82,14 +60,7 @@ topAir.stl
 {
     extractionMethod    extractFromSurface;
 
-    extractFromSurfaceCoeffs
-    {
-        // Mark edges whose adjacent surface normals are at an angle less
-        // than includedAngle as features
-        // - 0  : selects no edges
-        // - 180: selects all edges
-        includedAngle   150;
-    }
+    includedAngle       150;
 
     // Write options
     writeFeatureEdgeMesh    yes;