diff --git a/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui b/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui
index 9b565219d3..204283833a 100644
--- a/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui
+++ b/src/Mod/CAM/Gui/Resources/panels/PageOpWaterlineEdit.ui
@@ -214,7 +214,7 @@ A step over of 100% results in no overlap between two different cycles.</string>
          <string notr="true">mm</string>
         </property>
        </widget>
-      </item>      
+      </item>
       <item row="8" column="0">
        <widget class="QCheckBox" name="optimizeEnabled">
         <property name="toolTip">
@@ -241,7 +241,7 @@ A step over of 100% results in no overlap between two different cycles.</string>
          <string>Gap Detection Thershold</string>
         </property>
        </widget>
-      </item>      
+      </item>
       <item row="10" column="1">
        <widget class="Gui::InputField" name="gapDetectionThershold">
         <property name="toolTip">
@@ -251,7 +251,7 @@ A step over of 100% results in no overlap between two different cycles.</string>
          <string notr="true">mm</string>
         </property>
        </widget>
-      </item>            
+      </item>
      </layout>
     </widget>
    </item>
@@ -286,10 +286,10 @@ A step over of 100% results in no overlap between two different cycles.</string>
   <tabstop>cutPattern</tabstop>
   <tabstop>stepOver</tabstop>
   <tabstop>sampleInterval</tabstop>
-  <tabstop>minSampleInterval</tabstop>  
+  <tabstop>minSampleInterval</tabstop>
   <tabstop>optimizeEnabled</tabstop>
   <tabstop>optimizeInternal</tabstop>
-  <tabstop>gapDetectionThershold</tabstop>  
+  <tabstop>gapDetectionThershold</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/Mod/CAM/Path/Op/Gui/Waterline.py b/src/Mod/CAM/Path/Op/Gui/Waterline.py
index 641187ae50..817786ec3a 100644
--- a/src/Mod/CAM/Path/Op/Gui/Waterline.py
+++ b/src/Mod/CAM/Path/Op/Gui/Waterline.py
@@ -88,11 +88,11 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
 
         PathGuiUtil.updateInputField(obj, "MinSampleInterval", self.form.minSampleInterval)
         PathGuiUtil.updateInputField(obj, "SampleInterval", self.form.sampleInterval)
-        
+
         if obj.OptimizeInternalFeatures != self.form.optimizeInternal.isChecked():
             obj.OptimizeInternalFeatures = self.form.optimizeInternal.isChecked()
-            
-        PathGuiUtil.updateInputField(obj, "GapDetectionThershold", self.form.gapDetectionThershold)                   
+
+        PathGuiUtil.updateInputField(obj, "GapDetectionThershold", self.form.gapDetectionThershold)
 
         if obj.OptimizeLinearPaths != self.form.optimizeEnabled.isChecked():
             obj.OptimizeLinearPaths = self.form.optimizeEnabled.isChecked()
@@ -111,19 +111,19 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         self.form.stepOver.setValue(obj.StepOver)
         self.form.minSampleInterval.setText(
             FreeCAD.Units.Quantity(obj.MinSampleInterval.Value, FreeCAD.Units.Length).UserString
-        )         
+        )
         self.form.sampleInterval.setText(
             FreeCAD.Units.Quantity(obj.SampleInterval.Value, FreeCAD.Units.Length).UserString
-        )      
+        )
 
         if obj.OptimizeInternalFeatures:
             self.form.optimizeInternal.setCheckState(QtCore.Qt.Checked)
         else:
             self.form.optimizeInternal.setCheckState(QtCore.Qt.Unchecked)
-            
+
         self.form.gapDetectionThershold.setText(
             FreeCAD.Units.Quantity(obj.GapDetectionThershold.Value, FreeCAD.Units.Length).UserString
-        )                          
+        )
 
         if obj.OptimizeLinearPaths:
             self.form.optimizeEnabled.setCheckState(QtCore.Qt.Checked)
@@ -143,13 +143,13 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
         signals.append(self.form.cutPattern.currentIndexChanged)
         signals.append(self.form.boundaryAdjustment.editingFinished)
         signals.append(self.form.stepOver.editingFinished)
-        signals.append(self.form.minSampleInterval.editingFinished)        
+        signals.append(self.form.minSampleInterval.editingFinished)
         signals.append(self.form.sampleInterval.editingFinished)
-        signals.append(self.form.gapDetectionThershold.editingFinished)        
+        signals.append(self.form.gapDetectionThershold.editingFinished)
         if hasattr(self.form.optimizeInternal, "checkStateChanged"):  # Qt version >= 6.7.0
             signals.append(self.form.optimizeInternal.checkStateChanged)
         else:  # Qt version < 6.7.0
-            signals.append(self.form.optimizeInternal.stateChanged)        
+            signals.append(self.form.optimizeInternal.stateChanged)
 
         if hasattr(self.form.optimizeEnabled, "checkStateChanged"):  # Qt version >= 6.7.0
             signals.append(self.form.optimizeEnabled.checkStateChanged)
@@ -173,15 +173,15 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
             self.form.stepOver.hide()
             self.form.stepOver_label.hide()
             self.form.minSampleInterval.hide()
-            self.form.minSampleInterval_label.hide()            
+            self.form.minSampleInterval_label.hide()
             self.form.sampleInterval.show()
             self.form.sampleInterval_label.show()
             self.form.optimizeInternal.hide()
             self.form.gapDetectionThershold.hide()
-            self.form.gapDetectionThershold_label.hide()                       
+            self.form.gapDetectionThershold_label.hide()
         elif Algorithm == "OCL Adaptive":
             self.form.boundBoxSelect.hide()
-            self.form.boundBoxSelect_label.hide()            
+            self.form.boundBoxSelect_label.hide()
             self.form.cutPattern.hide()
             self.form.cutPattern_label.hide()
             self.form.boundaryAdjustment.hide()
@@ -189,15 +189,15 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
             self.form.stepOver.hide()
             self.form.stepOver_label.hide()
             self.form.minSampleInterval.show()
-            self.form.minSampleInterval_label.show()            
+            self.form.minSampleInterval_label.show()
             self.form.sampleInterval.show()
             self.form.sampleInterval_label.show()
-            self.form.optimizeInternal.show()            
+            self.form.optimizeInternal.show()
             self.form.gapDetectionThershold.show()
-            self.form.gapDetectionThershold_label.show()                                                                
+            self.form.gapDetectionThershold_label.show()
         elif Algorithm == "Experimental":
             self.form.boundBoxSelect.show()
-            self.form.boundBoxSelect_label.show()            
+            self.form.boundBoxSelect_label.show()
             self.form.cutPattern.show()
             self.form.boundaryAdjustment.show()
             self.form.cutPattern_label.show()
@@ -209,12 +209,12 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage):
                 self.form.stepOver.show()
                 self.form.stepOver_label.show()
             self.form.minSampleInterval.hide()
-            self.form.minSampleInterval_label.hide()                
+            self.form.minSampleInterval_label.hide()
             self.form.sampleInterval.hide()
             self.form.sampleInterval_label.hide()
             self.form.optimizeInternal.hide()
             self.form.gapDetectionThershold.hide()
-            self.form.gapDetectionThershold_label.hide()                                   
+            self.form.gapDetectionThershold_label.hide()
 
     def registerSignalHandlers(self, obj):
         self.form.algorithmSelect.currentIndexChanged.connect(self.updateVisibility)
diff --git a/src/Mod/CAM/Path/Op/SurfaceSupport.py b/src/Mod/CAM/Path/Op/SurfaceSupport.py
index 64e3b64427..895d01b3ed 100644
--- a/src/Mod/CAM/Path/Op/SurfaceSupport.py
+++ b/src/Mod/CAM/Path/Op/SurfaceSupport.py
@@ -36,7 +36,7 @@ import math
 # lazily loaded modules
 from lazy_loader.lazy_loader import LazyLoader
 
-MeshPart = LazyLoader('MeshPart', globals(), 'MeshPart') # tessellate bug Workaround
+MeshPart = LazyLoader("MeshPart", globals(), "MeshPart")  # tessellate bug Workaround
 Part = LazyLoader("Part", globals(), "Part")
 
 
@@ -1260,7 +1260,7 @@ def _makeSTL(model, obj, ocl, model_type=None):
             shape = model.Shape
         else:
             shape = model
-        #vertices, facet_indices = shape.tessellate(obj.LinearDeflection.Value) # tessellate workaround
+        # vertices, facet_indices = shape.tessellate(obj.LinearDeflection.Value) # tessellate workaround
         # Workaround for tessellate bug
         mesh = MeshPart.meshFromShape(Shape=shape, LinearDeflection=0.001, AngularDeflection=0.25)
         vertices = [point.Vector for point in mesh.Points]