diff --git a/freecad/Curves/Birail.py b/freecad/Curves/Birail.py
index b0aca8a..561fe80 100644
--- a/freecad/Curves/Birail.py
+++ b/freecad/Curves/Birail.py
@@ -1,3 +1,10 @@
+# -*- coding: utf-8 -*-
+
+__title__   = "Birail"
+__author__  = "Christophe Grellier (Chris_G)"
+__license__ = "LGPL 2.1"
+__doc__     = "Birail object to use with Sweep on 2 rails tool"
+
 import math
 import os
 import dummy
@@ -176,6 +183,9 @@ def Activated(self):
         FreeCAD.ActiveDocument.recompute()
 
     def GetResources(self):
-        return {'Pixmap' : path_curvesWB_icons+'/birail.svg', 'MenuText': 'Birail', 'ToolTip': 'Birail object to use with Sweep on 2 rails tool'}
+        return {'Pixmap' : path_curvesWB_icons+'/birail.svg', 
+                'MenuText': 'Birail', 
+                'ToolTip': ''
+        }
 
 FreeCADGui.addCommand('Birail', birailcommand())
diff --git a/freecad/Curves/Discretize.py b/freecad/Curves/Discretize.py
index 0205e9b..566fddf 100644
--- a/freecad/Curves/Discretize.py
+++ b/freecad/Curves/Discretize.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Discretize"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Discretize"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Discretize an edge or a wire."
+__doc__     = "Discretize an edge or a wire."
 
 import os
 import FreeCAD
@@ -289,9 +289,9 @@ def IsActive(self):
 
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Discretize', 'ToolTip': 'Discretize an edge or a wire'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Discretize',
+                'ToolTip': 'Discretize an edge or a wire'
+        }
 
 FreeCADGui.addCommand('Discretize', discretize())
-
-
-
diff --git a/freecad/Curves/ExtractShapes.py b/freecad/Curves/ExtractShapes.py
index c183ab9..e24deee 100644
--- a/freecad/Curves/ExtractShapes.py
+++ b/freecad/Curves/ExtractShapes.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Extract subshape"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Extract subshape"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Extract selected subshapes from objects."
+__doc__     = "Extract selected subshapes from objects."
 
 import os
 import FreeCAD
@@ -32,6 +32,9 @@ def Activated(self):
         FreeCAD.ActiveDocument.recompute()
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Extract', 'ToolTip': 'Extract selected subshapes from objects'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Extract',
+                'ToolTip': 'Extract selected subshapes from objects'
+        }
 
-FreeCADGui.addCommand('extract', extract()) 
+FreeCADGui.addCommand('extract', extract())
diff --git a/freecad/Curves/FaceMapFP.py b/freecad/Curves/FaceMapFP.py
index c2b9cbf..72a727e 100644
--- a/freecad/Curves/FaceMapFP.py
+++ b/freecad/Curves/FaceMapFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Face Map"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Face Map"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Flat map of a 3D face"""
+__doc__     = "Flat map of a 3D face
 
 import os
 import FreeCAD
diff --git a/freecad/Curves/HQRuledSurfaceFP.py b/freecad/Curves/HQRuledSurfaceFP.py
index 2e34656..46e2eee 100644
--- a/freecad/Curves/HQRuledSurfaceFP.py
+++ b/freecad/Curves/HQRuledSurfaceFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "HQ Ruled surface"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "HQ Ruled surface"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """High Quality ruled surface.
+__doc__     = """High Quality ruled surface.
 The 2 edges (or wires) are reparametrized before surface creation."""
 
 import sys
@@ -176,6 +176,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('hq_ruled_surface', HQ_Ruled_Surface_Command())
diff --git a/freecad/Curves/HelicalSweepFP.py b/freecad/Curves/HelicalSweepFP.py
index 2f1693c..83b0e18 100644
--- a/freecad/Curves/HelicalSweepFP.py
+++ b/freecad/Curves/HelicalSweepFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Helical Sweep"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Helical Sweep"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Sweep an open wire along an helical path"""
+__doc__     = "Sweep an open wire along an helical path"
 
 import sys
 if sys.version_info.major >= 3:
@@ -281,6 +281,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+        'MenuText': __title__,
+        'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('HelicalSweep', HelicalSweepCommand())
diff --git a/freecad/Curves/JoinCurves.py b/freecad/Curves/JoinCurves.py
index 2eaf618..7028212 100644
--- a/freecad/Curves/JoinCurves.py
+++ b/freecad/Curves/JoinCurves.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "joinCurves"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "joinCurves"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Joins the selected edges into BSpline Curves"
+__doc__     = "Joins the selected edges into BSpline Curves"
 
 import os
 import FreeCAD
@@ -227,7 +227,8 @@ def IsActive(self):
     def GetResources(self):
         return {'Pixmap': TOOL_ICON,
                 'MenuText': 'Join Curves',
-                'ToolTip': 'Joins the selected edges into BSpline Curves'}
+                'ToolTip': 'Joins the selected edges into BSpline Curves'
+        }
 
 
 FreeCADGui.addCommand('join', joinCommand())
diff --git a/freecad/Curves/OrientedSketchFP.py b/freecad/Curves/OrientedSketchFP.py
index 84201dd..c413a71 100644
--- a/freecad/Curves/OrientedSketchFP.py
+++ b/freecad/Curves/OrientedSketchFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Oriented sketch"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Oriented sketch"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Sketch normal to an edge, with up vector normal to a face"""
+__doc__     = "Sketch normal to an edge, with up vector normal to a face"
 
 import sys
 if sys.version_info.major >= 3:
@@ -160,6 +160,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('oriented_sketch', oriented_sketch_cmd())
diff --git a/freecad/Curves/Outline_FP.py b/freecad/Curves/Outline_FP.py
index 88f47a8..908b367 100644
--- a/freecad/Curves/Outline_FP.py
+++ b/freecad/Curves/Outline_FP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Outline Curve"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Outline Curve"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Outline curve of a shape"""
+__doc__     = "Outline curve of a shape"
 
 import sys
 if sys.version_info.major >= 3:
@@ -153,6 +153,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('outline', outline_cmd())
diff --git a/freecad/Curves/ParametricBlendCurve.py b/freecad/Curves/ParametricBlendCurve.py
index 13ae07b..09612cf 100644
--- a/freecad/Curves/ParametricBlendCurve.py
+++ b/freecad/Curves/ParametricBlendCurve.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Blend curve"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Blend curve"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Blend curve between two edges."
+__doc__     = "Blend curve between two edges."
 
 import os
 import FreeCAD
@@ -578,7 +578,10 @@ def Activated(self):
         FreeCAD.ActiveDocument.recompute()
 
     def GetResources(self):
-        return {'Pixmap': TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap': TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 
 FreeCADGui.addCommand('ParametricBlendCurve', ParametricBlendCurve())
diff --git a/freecad/Curves/ParametricComb.py b/freecad/Curves/ParametricComb.py
index db67b83..f5b2a20 100644
--- a/freecad/Curves/ParametricComb.py
+++ b/freecad/Curves/ParametricComb.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Comb plot"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Comb plot"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = 'Creates a parametric Comb plot on selected edges'
+__doc__     = 'Creates a parametric Comb plot on selected edges'
 
 import os
 import FreeCAD
@@ -589,9 +589,12 @@ def Activated(self):
             ViewProviderComb(obj.ViewObject)
         else:
             self.appendEdges(combSelected, edges)
-            
+
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('ParametricComb', ParametricComb())
 
diff --git a/freecad/Curves/ProfileSketch.py b/freecad/Curves/ProfileSketch.py
index 1f95b57..3bb5e68 100644
--- a/freecad/Curves/ProfileSketch.py
+++ b/freecad/Curves/ProfileSketch.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = 'Profile support plane'
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = 'Profile support plane'
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = 'Creates a support plane for sketches'
+__doc__     = 'Creates a support plane for sketches'
 
 import os
 import FreeCAD
@@ -149,6 +149,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('profileSupportCmd', profSupCommand())
diff --git a/freecad/Curves/ReflectLinesFP.py b/freecad/Curves/ReflectLinesFP.py
index a2c55c0..2860181 100644
--- a/freecad/Curves/ReflectLinesFP.py
+++ b/freecad/Curves/ReflectLinesFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Reflect Lines"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Reflect Lines"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Creates the reflect lines on a shape, according to a view direction"""
+__doc__     = "Creates the reflect lines on a shape, according to a view direction"
 
 import sys
 if sys.version_info.major >= 3:
@@ -138,7 +138,10 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 def run():
     ReflectLinesCommand().Activated()
diff --git a/freecad/Curves/Sketch_On_Surface.py b/freecad/Curves/Sketch_On_Surface.py
index 2193e52..9e17aa2 100644
--- a/freecad/Curves/Sketch_On_Surface.py
+++ b/freecad/Curves/Sketch_On_Surface.py
@@ -1,9 +1,9 @@
 #  -*- coding: utf-8 -*-
 
-__title__ = "Sketch on surface"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Sketch on surface"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Map a sketch on a surface"
+__doc__     = "Map a sketch on a surface"
 
 import os
 import FreeCAD
@@ -461,7 +461,8 @@ def Activated(self):
     def GetResources(self):
         return {'Pixmap': TOOL_ICON,
                 'MenuText': __title__,
-                'ToolTip': __doc__}
+                'ToolTip': __doc__
+        }
 
 
 FreeCADGui.addCommand('SoS', SoS())
diff --git a/freecad/Curves/TemplateFP.py b/freecad/Curves/TemplateFP.py
index 4080d41..4a57045 100644
--- a/freecad/Curves/TemplateFP.py
+++ b/freecad/Curves/TemplateFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Face Map"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Face Map"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Flat map of a 3D face"""
+__doc__     = "Flat map of a 3D face"
 
 import os
 import FreeCAD
@@ -125,7 +125,8 @@ def IsActive(self):
     def GetResources(self):
         return {'Pixmap': TOOL_ICON,
                 'MenuText': __title__,
-                'ToolTip': __doc__}
+                'ToolTip': __doc__
+        }
 
 
 FreeCADGui.addCommand('tool_name', ToolCommand())
diff --git a/freecad/Curves/_utils.py b/freecad/Curves/_utils.py
index 46cdbe1..9479b49 100644
--- a/freecad/Curves/_utils.py
+++ b/freecad/Curves/_utils.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Curves workbench utilities"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Curves workbench utilities"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Curves workbench utilities common to all tools."
+__doc__     = "Curves workbench utilities common to all tools."
 
 import FreeCAD
 import Part
diff --git a/freecad/Curves/adjacent_faces.py b/freecad/Curves/adjacent_faces.py
index 6f69f57..30b2854 100644
--- a/freecad/Curves/adjacent_faces.py
+++ b/freecad/Curves/adjacent_faces.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Select Adjacent faces"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Select Adjacent faces"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Select the Adjacent faces of the selected subshape"
+__doc__     = "Select the Adjacent faces of the selected subshape"
 
 # import FreeCAD
 from FreeCADGui import Selection as sel
@@ -66,7 +66,7 @@ def IsActive(self):
     def GetResources(self):
         return {'Pixmap': TOOL_ICON,
                 'MenuText': 'Adjacent faces',
-                'ToolTip': 'Select the adjacent faces of the selected shape'}
-
+                'ToolTip': 'Select the adjacent faces of the selected shape'
+        }
 
 addCommand('adjacent_faces', adjacentfacesCommand())
diff --git a/freecad/Curves/approximate.py b/freecad/Curves/approximate.py
index 57cad55..30c1b94 100644
--- a/freecad/Curves/approximate.py
+++ b/freecad/Curves/approximate.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Approximate"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Approximate"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Approximate a set of points."
+__doc__     = "Approximate a set of points."
 
 import os
 import FreeCAD
diff --git a/freecad/Curves/approximate_extension.py b/freecad/Curves/approximate_extension.py
index b3cd60c..aa78af2 100644
--- a/freecad/Curves/approximate_extension.py
+++ b/freecad/Curves/approximate_extension.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Approximate extension"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Approximate extension"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Approximate extension for other FeaturePython objects."
+__doc__     = "Approximate extension for other FeaturePython objects."
 
 import os
 import FreeCAD
diff --git a/freecad/Curves/bezierCurve-selection.py b/freecad/Curves/bezierCurve-selection.py
index 7101fad..eaac427 100644
--- a/freecad/Curves/bezierCurve-selection.py
+++ b/freecad/Curves/bezierCurve-selection.py
@@ -1,3 +1,11 @@
+# -*- coding: utf-8 -*-
+
+__title__   = "Bezier Curve"
+__author__  = "Christophe Grellier (Chris_G)"
+__license__ = "LGPL 2.1"
+__doc__     = "Creates a Bezier curve by clicking 4 points on the screen"
+
+
 import os
 import FreeCAD, FreeCADGui, Part
 from pivy import coin
@@ -117,5 +125,9 @@ def cursor_cb(self, event_callback):
 
 
     def GetResources(self):
-        return {'Pixmap' : path_curvesWB_icons+'/bezier.svg', 'MenuText': 'Bezier Curve', 'ToolTip': 'Creates a Bezier curve by clicking 4 points on the screen'}
+        return {'Pixmap' : path_curvesWB_icons+'/bezier.svg',
+                'MenuText': 'Bezier Curve',
+                'ToolTip': 'Creates a Bezier curve by clicking 4 points on the screen'
+        }
+
 FreeCADGui.addCommand('bezierCurve', bezierCurve())
diff --git a/freecad/Curves/bezierCurve.py b/freecad/Curves/bezierCurve.py
index f64e47b..fe23676 100644
--- a/freecad/Curves/bezierCurve.py
+++ b/freecad/Curves/bezierCurve.py
@@ -1,3 +1,10 @@
+# -*- coding: utf-8 -*-
+
+__title__   = "BSpline Curve"
+__author__  = "Christophe Grellier (Chris_G)"
+__license__ = "LGPL 2.1"
+
+
 import os
 import FreeCAD, FreeCADGui, Part
 from pivy import coin
@@ -223,5 +230,9 @@ def cursor_cb(self, event_callback):
 
 
     def GetResources(self):
-        return {'Pixmap' : path_curvesWB_icons+'/bezier.svg', 'MenuText': 'BSpline Curve', 'ToolTip': 'Creates a BSpline curve'}
+        return {'Pixmap' : path_curvesWB_icons+'/bezier.svg', 
+                'MenuText': 'BSpline Curve', 
+                'ToolTip': 'Creates a BSpline curve'
+        }
+
 FreeCADGui.addCommand('bezierCurve', bezierCurve())
diff --git a/freecad/Curves/combined_curve.py b/freecad/Curves/combined_curve.py
index b23c035..51e547d 100644
--- a/freecad/Curves/combined_curve.py
+++ b/freecad/Curves/combined_curve.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Combined projection curve"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Combined projection curve"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Builds a 3D curve as the intersection of 2 projected curves."
+__doc__     = "Builds a 3D curve as the intersection of 2 projected curves."
 
 import FreeCAD
 import FreeCADGui
@@ -135,6 +135,9 @@ def IsActive(self):
         return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Combined projection curve', 'ToolTip': 'Builds a 3D curve as the intersection of 2 projected curves'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Combined projection curve',
+                'ToolTip': 'Builds a 3D curve as the intersection of 2 projected curves'
+        }
 
 FreeCADGui.addCommand('combined_projection', CombinedProjectionCmd())
diff --git a/freecad/Curves/comp_spring.py b/freecad/Curves/comp_spring.py
index 2f71b33..4eb59fd 100644
--- a/freecad/Curves/comp_spring.py
+++ b/freecad/Curves/comp_spring.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Compression Spring"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Compression Spring"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Parametric Compression Spring"""
+__doc__     = """Parametric Compression Spring"""
 
 import sys
 if sys.version_info.major >= 3:
@@ -282,6 +282,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON, 
+                'MenuText': __title__, 
+                'ToolTip': __doc__
+        .}
 
 FreeCADGui.addCommand('comp_spring', CompSpringCommand())
diff --git a/freecad/Curves/curveExtendFP.py b/freecad/Curves/curveExtendFP.py
index 747d8b9..7a7dd75 100644
--- a/freecad/Curves/curveExtendFP.py
+++ b/freecad/Curves/curveExtendFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Curve extend"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Curve extend"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Extend an edge by a given distance."
+__doc__     = "Extend an edge by a given distance."
 
 import os
 import FreeCAD
@@ -137,6 +137,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Extend Curve', 'ToolTip': 'Extends the selected edge'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Extend Curve',
+                'ToolTip': 'Extends the selected edge'
+        }
 
 FreeCADGui.addCommand('extend', extendCommand())
diff --git a/freecad/Curves/curveOnSurfaceFP.py b/freecad/Curves/curveOnSurfaceFP.py
index c91256b..a9f48bf 100644
--- a/freecad/Curves/curveOnSurfaceFP.py
+++ b/freecad/Curves/curveOnSurfaceFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Curve on surface"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Curve on surface"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Creates a parametric curve on surface object."
+__doc__     = "Creates a parametric curve on surface object."
 
 import os
 import FreeCAD
@@ -135,6 +135,9 @@ def Activated(self):
 
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'CurveOnSurface', 'ToolTip': 'Create a curve on surface object'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'CurveOnSurface',
+                'ToolTip': 'Create a curve on surface object'
+        }
 
 FreeCADGui.addCommand('cos', cosCommand())
diff --git a/freecad/Curves/curve_to_script.py b/freecad/Curves/curve_to_script.py
index 4df2582..36869b5 100644
--- a/freecad/Curves/curve_to_script.py
+++ b/freecad/Curves/curve_to_script.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "BSpline to script"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "BSpline to script"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Creates a python script to build the selected BSpline curves."
+__doc__     = "Creates a python script to build the selected BSpline curves."
 
 import os
 import FreeCAD
diff --git a/freecad/Curves/gordonFP.py b/freecad/Curves/gordonFP.py
index 562a4b7..72ff80c 100644
--- a/freecad/Curves/gordonFP.py
+++ b/freecad/Curves/gordonFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Parametric Gordon surface"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Parametric Gordon surface"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Creates a surface that skins a network of curves."
+__doc__     = "Creates a surface that skins a network of curves."
 
 import sys
 if sys.version_info.major >= 3:
@@ -199,6 +199,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Gordon surface', 'ToolTip': 'Creates a surface that skins a network of curves'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Gordon surface', 
+                'ToolTip': 'Creates a surface that skins a network of curves'
+        }
 
 FreeCADGui.addCommand('gordon', gordonCommand())
diff --git a/freecad/Curves/gordon_profile_FP.py b/freecad/Curves/gordon_profile_FP.py
index f87e2b3..c71e9ac 100644
--- a/freecad/Curves/gordon_profile_FP.py
+++ b/freecad/Curves/gordon_profile_FP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Freehand BSpline"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Freehand BSpline"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Creates an freehand BSpline curve"
+__doc__     = "Creates an freehand BSpline curve"
 
 import sys
 if sys.version_info.major >= 3:
@@ -326,6 +326,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('gordon_profile', GordonProfileCommand())
diff --git a/freecad/Curves/import3DM.py b/freecad/Curves/import3DM.py
index e57eadb..3f8d443 100644
--- a/freecad/Curves/import3DM.py
+++ b/freecad/Curves/import3DM.py
@@ -1,7 +1,7 @@
-__title__ = "import3DM"
-__author__ = "Christophe Grellier (Chris_G) - Keith Sloan (keithsloan52)"
+__title__   = "import3DM"
+__author__  = "Christophe Grellier (Chris_G) - Keith Sloan (keithsloan52)"
 __license__ = "LGPL 2.1"
-__doc__ = "import of 3DM file"
+__doc__     = "import of 3DM file"
 
 import FreeCAD
 import os, io, sys
diff --git a/freecad/Curves/interpolate.py b/freecad/Curves/interpolate.py
index c3232c3..3e56dd3 100644
--- a/freecad/Curves/interpolate.py
+++ b/freecad/Curves/interpolate.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Interpolate"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Interpolate"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Interpolate a set of points."
+__doc__     = "Interpolate a set of points."
 
 import os
 import FreeCAD
@@ -277,11 +277,11 @@ def Activated(self):
         Interpolate(obj,source)
         ViewProviderInterpolate(obj.ViewObject)
         FreeCAD.ActiveDocument.recompute()
-            
+
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Interpolate', 'ToolTip': 'Interpolate points with a BSpline curve'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Interpolate',
+                'ToolTip': 'Interpolate points with a BSpline curve'
+        }
 
 FreeCADGui.addCommand('Interpolate', interpolate())
-
-
-
diff --git a/freecad/Curves/isocurves.py b/freecad/Curves/isocurves.py
index ed36df6..9517670 100644
--- a/freecad/Curves/isocurves.py
+++ b/freecad/Curves/isocurves.py
@@ -1,7 +1,7 @@
-__title__ = "isoCurves for FreeCAD"
-__author__ = "Chris_G"
+__title__   = "isoCurves for FreeCAD"
+__author__  = "Chris_G"
 __license__ = "LGPL 2.1"
-__doc__ = '''
+__doc__     = '''
 import isocurves
 single = isocurves.isoCurve(face,'U',0.5)
 Part.show(single.toShape())
diff --git a/freecad/Curves/lineFP.py b/freecad/Curves/lineFP.py
index 912fbc5..64588dc 100644
--- a/freecad/Curves/lineFP.py
+++ b/freecad/Curves/lineFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Parametric line"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Parametric line"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Parametric line between two vertexes."
+__doc__     = "Parametric line between two vertices."
 
 import os
 import FreeCAD
@@ -17,7 +17,7 @@
 debug = _utils.doNothing
 
 class line:
-    """Creates a parametric line between two vertexes"""
+    """Creates a parametric line between two vertices"""
     def __init__(self, obj):
         """Add the properties"""
         obj.addProperty("App::PropertyLinkSub", "Vertex1", "Line", "First Vertex")
@@ -36,7 +36,7 @@ def execute(self, obj):
 class lineVP:
     def __init__(self,vobj):
         vobj.Proxy = self
-       
+
     def getIcon(self):
         return(TOOL_ICON)
 
@@ -51,7 +51,7 @@ def __setstate__(self,state):
         return(None)
 
 class lineCommand:
-    """Creates a parametric line between two vertexes"""
+    """Creates a parametric line between two vertices"""
     def makeLineFeature(self,source):
         lineObj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Line")
         line(lineObj)
@@ -64,7 +64,7 @@ def Activated(self):
         verts = []
         sel = FreeCADGui.Selection.getSelectionEx()
         if sel == []:
-            FreeCAD.Console.PrintError("Select 2 vertexes !\n")
+            FreeCAD.Console.PrintError("Select 2 vertices !\n")
         for selobj in sel:
             if selobj.HasSubObjects:
                 for i in range(len(selobj.SubObjects)):
@@ -81,6 +81,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Line', 'ToolTip': 'Creates a line between 2 vertexes'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Line',
+                'ToolTip': 'Creates a line between 2 vertices'
+        }
 
 FreeCADGui.addCommand('line', lineCommand())
diff --git a/freecad/Curves/manipulators.py b/freecad/Curves/manipulators.py
index 52d8178..736a029 100644
--- a/freecad/Curves/manipulators.py
+++ b/freecad/Curves/manipulators.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Manipulators"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Manipulators"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "FreeCAD interactive editing library"
+__doc__     = "FreeCAD interactive editing library"
 
 import sys
 if sys.version_info.major >= 3:
diff --git a/freecad/Curves/mixed_curve.py b/freecad/Curves/mixed_curve.py
index f5b03e7..6fa1ba7 100644
--- a/freecad/Curves/mixed_curve.py
+++ b/freecad/Curves/mixed_curve.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Mixed curve"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Mixed curve"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Builds a 3D curve as the intersection of 2 projected curves."
+__doc__     = "Builds a 3D curve as the intersection of 2 projected curves."
 
 import os
 import FreeCAD
@@ -137,6 +137,9 @@ def IsActive(self):
         return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Mixed curve', 'ToolTip': 'Builds a 3D curve as the intersection of 2 projected curves'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Mixed curve',
+                'ToolTip': 'Builds a 3D curve as the intersection of 2 projected curves'
+        }
 
 FreeCADGui.addCommand('mixed_curve', MixedCurveCmd())
diff --git a/freecad/Curves/multiLoftFP.py b/freecad/Curves/multiLoftFP.py
index cb956cf..7c8d829 100644
--- a/freecad/Curves/multiLoftFP.py
+++ b/freecad/Curves/multiLoftFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "MultiLoft"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "MultiLoft"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Loft profile objects made of multiple faces in parallel"""
+__doc__     = "Loft profile objects made of multiple faces in parallel"
 
 import os
 import FreeCAD
@@ -162,6 +162,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('MultiLoft', MultiLoftCommand())
diff --git a/freecad/Curves/nurbs_tools.py b/freecad/Curves/nurbs_tools.py
index 0df7ec7..7800cd9 100644
--- a/freecad/Curves/nurbs_tools.py
+++ b/freecad/Curves/nurbs_tools.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Nurbs tools"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Nurbs tools"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Collection of tools for Nurbs."
+__doc__     = "Collection of tools for Nurbs."
 
 import FreeCAD
 import Part
diff --git a/freecad/Curves/parametricSolid.py b/freecad/Curves/parametricSolid.py
index ac4a008..6595d64 100644
--- a/freecad/Curves/parametricSolid.py
+++ b/freecad/Curves/parametricSolid.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Parametric solid"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Parametric solid"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Make a parametric solid from selected faces."
+__doc__     = "Make a parametric solid from selected faces."
 
 import os
 import FreeCAD
diff --git a/freecad/Curves/pipeshellFP.py b/freecad/Curves/pipeshellFP.py
index d1d7e63..336f74a 100644
--- a/freecad/Curves/pipeshellFP.py
+++ b/freecad/Curves/pipeshellFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = 'Pipeshell'
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = 'Pipeshell'
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = 'Creates a PipeShell sweep object'
+__doc__     = 'Creates a PipeShell sweep object'
 
 import os
 import FreeCAD
@@ -374,6 +374,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('pipeshell', pipeShellCommand())
diff --git a/freecad/Curves/pipeshellProfileFP.py b/freecad/Curves/pipeshellProfileFP.py
index 4bbe232..cb99ef7 100644
--- a/freecad/Curves/pipeshellProfileFP.py
+++ b/freecad/Curves/pipeshellProfileFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = 'Pipeshell profile'
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = 'Pipeshell profile'
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = 'Creates a Profile object for PipeShell'
+__doc__     = 'Creates a Profile object for PipeShell'
 
 import os
 import FreeCAD
@@ -162,6 +162,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('profile', profileCommand())
diff --git a/freecad/Curves/reparametrize.py b/freecad/Curves/reparametrize.py
index eb0919e..07060ea 100644
--- a/freecad/Curves/reparametrize.py
+++ b/freecad/Curves/reparametrize.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Curve re-parametrize"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Curve re-parametrize"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """reparametrize a curve to match another one"""
+__doc__     = "reparametrize a curve to match another one"
 
 #import sys
 #if sys.version_info.major >= 3:
diff --git a/freecad/Curves/segmentSurfaceFP.py b/freecad/Curves/segmentSurfaceFP.py
index a5301f9..f7142aa 100644
--- a/freecad/Curves/segmentSurfaceFP.py
+++ b/freecad/Curves/segmentSurfaceFP.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Segment surface"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Segment surface"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = """Segment a surface on isocurves"""
+__doc__     = "Segment a surface on isocurves"
 
 import os
 
@@ -208,7 +208,9 @@ def IsActive(self):
             return(False)
 
     def GetResources(self):
-        return {'Pixmap': TOOL_ICON, 'MenuText': __title__, 'ToolTip': __doc__}
-
+        return {'Pixmap': TOOL_ICON,
+                'MenuText': __title__,
+                'ToolTip': __doc__
+        }
 
 FreeCADGui.addCommand('segment_surface', SegSurfCommand())
diff --git a/freecad/Curves/splitCurves_2.py b/freecad/Curves/splitCurves_2.py
index fbe2376..bdf703f 100644
--- a/freecad/Curves/splitCurves_2.py
+++ b/freecad/Curves/splitCurves_2.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Split curve"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Split curve"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Splits the selected edge."
+__doc__     = "Splits the selected edge."
 
 import sys
 if sys.version_info.major >= 3:
@@ -594,6 +594,9 @@ def IsActive(self):
             return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Split Curve', 'ToolTip': 'Splits the selected edge'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Split Curve',
+                'ToolTip': 'Splits the selected edge'
+        }
 
 FreeCADGui.addCommand('split', splitCommand())
diff --git a/freecad/Curves/sublink_edit.py b/freecad/Curves/sublink_edit.py
index 588f036..8fc13d2 100644
--- a/freecad/Curves/sublink_edit.py
+++ b/freecad/Curves/sublink_edit.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "Sublink Editor"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "Sublink Editor"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Editor widget for sublink properties of objects"
+__doc__     = "Editor widget for sublink properties of objects"
 
 import os
 import FreeCAD
@@ -267,7 +267,10 @@ def IsActive(self):
         return False
 
     def GetResources(self):
-        return {'Pixmap' : TOOL_ICON, 'MenuText': 'Sublink editor', 'ToolTip': 'Editor widget for sublink properties of objects'}
+        return {'Pixmap' : TOOL_ICON,
+                'MenuText': 'Sublink editor',
+                'ToolTip': 'Editor widget for sublink properties of objects'
+        }
 
 FreeCADGui.addCommand('SublinkEditor', sle())
 
diff --git a/freecad/Curves/toConsole.py b/freecad/Curves/toConsole.py
index db8c0b7..92b1189 100644
--- a/freecad/Curves/toConsole.py
+++ b/freecad/Curves/toConsole.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-__title__ = "to console"
-__author__ = "Christophe Grellier (Chris_G)"
+__title__   = "to console"
+__author__  = "Christophe Grellier (Chris_G)"
 __license__ = "LGPL 2.1"
-__doc__ = "Objects to python console."
+__doc__     = "Objects to python console."
 
 import FreeCAD
 import FreeCADGui
@@ -21,7 +21,8 @@ def GetResources(self):
         return {'Pixmap'  : TOOL_ICON,
                 'MenuText': "to Console",
                 'Accel': "",
-                'ToolTip': "Objects to console"}
+                'ToolTip': "Objects to console"
+        }
 
     def Activated(self):
         doc = ''