diff --git a/src/Mod/Draft/draftutils/init_tools.py b/src/Mod/Draft/draftutils/init_tools.py
index 327756dba5..6228a41680 100644
--- a/src/Mod/Draft/draftutils/init_tools.py
+++ b/src/Mod/Draft/draftutils/init_tools.py
@@ -1,14 +1,3 @@
-"""Provides lists of commands for the Draft Workbench.
-
-This module returns lists of commands, so that the toolbars
-can be initialized by Draft, and by other workbenches.
-These commands should be defined in `DraftTools`, and in the individual
-modules in `draftguitools`.
-"""
-## @package init_tools
-# \ingroup DRAFT
-# \brief This module provides lists of commands for the Draft Workbench.
-
 # ***************************************************************************
 # *   (c) 2020 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de>           *
 # *                                                                         *
@@ -31,6 +20,16 @@ modules in `draftguitools`.
 # *   USA                                                                   *
 # *                                                                         *
 # ***************************************************************************
+"""Provides lists of commands for the Draft Workbench.
+
+This module returns lists of commands, so that the toolbars
+can be initialized by Draft, and by other workbenches.
+These commands should be defined in `DraftTools`, and in the individual
+modules in `draftguitools`.
+"""
+## @package init_tools
+# \ingroup DRAFT
+# \brief This module provides lists of commands for the Draft Workbench.
 
 from PySide.QtCore import QT_TRANSLATE_NOOP
 
@@ -61,7 +60,7 @@ def get_draft_modification_commands():
     """Return the modification commands list."""
     lst = ["Draft_Move", "Draft_Rotate",
            "Draft_Scale", "Draft_Mirror",
-           "Draft_Offset", "Draft_Trimex", 
+           "Draft_Offset", "Draft_Trimex",
            "Draft_Stretch",
            "Separator",
            "Draft_Clone"]
diff --git a/src/Mod/Draft/draftutils/messages.py b/src/Mod/Draft/draftutils/messages.py
index 7686fa5039..e1f8c99cdc 100644
--- a/src/Mod/Draft/draftutils/messages.py
+++ b/src/Mod/Draft/draftutils/messages.py
@@ -1,8 +1,3 @@
-"""Provide message utility functions for the Draft Workbench."""
-## @package messages
-# \ingroup DRAFT
-# \brief Provide message utility functions for the Draft Workbench.
-
 # ***************************************************************************
 # *   (c) 2020 Eliud Cabrera Castillo <e.cabrera-castillo@tum.de>           *
 # *                                                                         *
@@ -25,6 +20,16 @@
 # *   USA                                                                   *
 # *                                                                         *
 # ***************************************************************************
+"""Provide message utility functions for the Draft Workbench.
+
+The Console module has long function names, so we define some shorthands
+that are suitable for use in every workbench. These shorthands also include
+a newline character at the end of the string, so it doesn't have to be
+added manually.
+"""
+## @package messages
+# \ingroup DRAFT
+# \brief Provide message utility functions for the Draft Workbench.
 
 import FreeCAD as App