diff --git a/src/Mod/Part/AttachmentEditor/Commands.py b/src/Mod/Part/AttachmentEditor/Commands.py
index 83161835dc..f19e7c813c 100644
--- a/src/Mod/Part/AttachmentEditor/Commands.py
+++ b/src/Mod/Part/AttachmentEditor/Commands.py
@@ -103,3 +103,4 @@ if App.GuiUp:
     import FreeCADGui as Gui
     command_instance = CommandEditAttachment()
     Gui.addCommand('Part_EditAttachment', command_instance)
+
diff --git a/src/Mod/Part/AttachmentEditor/FrozenClass.py b/src/Mod/Part/AttachmentEditor/FrozenClass.py
index 74b175380c..475cf2c35e 100644
--- a/src/Mod/Part/AttachmentEditor/FrozenClass.py
+++ b/src/Mod/Part/AttachmentEditor/FrozenClass.py
@@ -34,3 +34,4 @@ class FrozenClass(object):
 
     def _unfreeze(self):
         self.__isfrozen = False
+
diff --git a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
index 3376f8db88..7950ddba8d 100644
--- a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
+++ b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
@@ -611,3 +611,4 @@ class AttachmentEditorTaskPanel(FrozenClass):
         Gui.Selection.removeObserver(self)
         if self.tv:
             self.tv.restore()
+
diff --git a/src/Mod/Part/CompoundTools/Explode.py b/src/Mod/Part/CompoundTools/Explode.py
index 546e323583..f610afea63 100644
--- a/src/Mod/Part/CompoundTools/Explode.py
+++ b/src/Mod/Part/CompoundTools/Explode.py
@@ -23,3 +23,4 @@ def explodeCompound(compound_obj, b_group = None):
         cf.ViewObject.DontUnhideOnDelete = True
         features_created.append(cf)
     return (group, features_created)
+
diff --git a/src/Mod/Part/InitGui.py b/src/Mod/Part/InitGui.py
index b427f92be8..866f1fdf12 100644
--- a/src/Mod/Part/InitGui.py
+++ b/src/Mod/Part/InitGui.py
@@ -1,40 +1,40 @@
-# Part gui init module
-# (c) 2003 Juergen Riegel
-#
-# Gathering all the information to start FreeCAD
-# This is the second one of three init scripts, the third one
-# runs when the gui is up
+# ***************************************************************************
+# *   Copyright (c) 2002 Juergen Riegel <juergen.riegel@web.de>             *
+# *                                                                         *
+# *   This file is part of the FreeCAD CAx development system.              *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   FreeCAD is distributed in the hope that it will be useful,            *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Lesser General Public License for more details.                   *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with FreeCAD; if not, write to the Free Software        *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+"""Initialization of the Part Workbench graphical interface."""
 
-#***************************************************************************
-#*   (c) Juergen Riegel (juergen.riegel@web.de) 2002                       *
-#*                                                                         *
-#*   This file is part of the FreeCAD CAx development system.              *
-#*                                                                         *
-#*   This program is free software; you can redistribute it and/or modify  *
-#*   it under the terms of the GNU Lesser General Public License (LGPL)    *
-#*   as published by the Free Software Foundation; either version 2 of     *
-#*   the License, or (at your option) any later version.                   *
-#*   for detail see the LICENCE text file.                                 *
-#*                                                                         *
-#*   FreeCAD is distributed in the hope that it will be useful,            *
-#*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-#*   GNU Lesser General Public License for more details.                   *
-#*                                                                         *
-#*   You should have received a copy of the GNU Library General Public     *
-#*   License along with FreeCAD; if not, write to the Free Software        *
-#*   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
-#*   USA                                                                   *
-#*                                                                         *
-#*   Juergen Riegel 2002                                                   *
-#***************************************************************************/
+import FreeCAD as App
+import FreeCADGui as Gui
+import os
 
 
+class PartWorkbench(Gui.Workbench):
+    """Part workbench object."""
 
-class PartWorkbench ( Workbench ):
-    "Part workbench object"
     def __init__(self):
-        self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Part/Resources/icons/PartWorkbench.svg"
+        self.__class__.Icon = os.path.join(App.getResourceDir(),
+                                           "Mod", "Part",
+                                           "Resources", "icons",
+                                           "PartWorkbench.svg")
         self.__class__.MenuText = "Part"
         self.__class__.ToolTip = "Part workbench"
 
@@ -45,14 +45,15 @@ class PartWorkbench ( Workbench ):
         try:
             import BasicShapes.Shapes
         except ImportError as err:
-            FreeCAD.Console.PrintError("Features from BasicShapes package cannot be loaded. {err}\n".format(err= str(err)))
+            App.Console.PrintError("'BasicShapes' package cannot be loaded. "
+                                   "{err}\n".format(err=str(err)))
 
         try:
             import CompoundTools._CommandCompoundFilter
             import CompoundTools._CommandExplodeCompound
         except ImportError as err:
-            FreeCAD.Console.PrintError("Features from CompoundTools package cannot be loaded. {err}\n".format(err= str(err)))
-
+            App.Console.PrintError("'CompoundTools' package cannot be loaded. "
+                                   "{err}\n".format(err=str(err)))
 
         try:
             bop = __import__("BOPTools")
@@ -60,11 +61,13 @@ class PartWorkbench ( Workbench ):
             bop.addCommands()
             PartGui.BOPTools = bop
         except Exception as err:
-            FreeCAD.Console.PrintError("Features from BOPTools package cannot be loaded. {err}\n".format(err= str(err)))        
+            App.Console.PrintError("'BOPTools' package cannot be loaded. "
+                                   "{err}\n".format(err=str(err)))
 
     def GetClassName(self):
         return "PartGui::Workbench"
 
+
 Gui.addWorkbench(PartWorkbench())
 
-FreeCAD.__unit_test__ += [ "TestPartGui" ]
+App.__unit_test__ += ["TestPartGui"]