diff --git a/docs/sphinxext/mantiddoc/autodoc.py b/docs/sphinxext/mantiddoc/autodoc.py
index 7817b508f97653e2d5eb9815fe7730779ad70056..bd4837657e339d297da7d8e938dd67ef301de427 100644
--- a/docs/sphinxext/mantiddoc/autodoc.py
+++ b/docs/sphinxext/mantiddoc/autodoc.py
@@ -21,4 +21,4 @@ def skip(app, what, name, obj, skip, options):
 def setup(app):
     # Define which methods are skipped when running autodoc
     # on a member
-    app.connect("autodoc-skip-member", skip)
\ No newline at end of file
+    app.connect("autodoc-skip-member", skip)
diff --git a/docs/sphinxext/mantiddoc/directives/__init__.py b/docs/sphinxext/mantiddoc/directives/__init__.py
index aea156091ece2b95afd69e828c186a76bc2469b3..f6e7c496ec600f27ad1f1ae1b1f68f7995899d6d 100644
--- a/docs/sphinxext/mantiddoc/directives/__init__.py
+++ b/docs/sphinxext/mantiddoc/directives/__init__.py
@@ -7,7 +7,15 @@
    'mantiddoc.directives' to be added to the Sphinx extensions configuration.
 """
 
-import algorithm, alias, attributes, categories, diagram, interface, properties, sourcelink, summary
+import mantiddoc.directives.algorithm
+import mantiddoc.directives.alias
+import mantiddoc.directives.attributes
+import mantiddoc.directives.categories
+import mantiddoc.directives.diagram
+import mantiddoc.directives.interface
+import mantiddoc.directives.properties
+import mantiddoc.directives.sourcelink
+import mantiddoc.directives.summary
 
 def setup(app):
     """
diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index 92afaa96abf20ab2192d2837ac53b722f614fcc4..a7d92a9a18dcf2f2fcee0c44fe281433e1d5ff40 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -1,4 +1,4 @@
-from base import AlgorithmBaseDirective
+from mantiddoc.directives.base import AlgorithmBaseDirective
 from docutils import nodes
 from sphinx.locale import _
 from sphinx.util.compat import make_admonition
diff --git a/docs/sphinxext/mantiddoc/directives/alias.py b/docs/sphinxext/mantiddoc/directives/alias.py
index 14000548f1ad1cd5fa59c4c3bf19537dab22a25c..b567306969544d6f79d66e5272eaef34ffc163b6 100644
--- a/docs/sphinxext/mantiddoc/directives/alias.py
+++ b/docs/sphinxext/mantiddoc/directives/alias.py
@@ -1,4 +1,4 @@
-from base import AlgorithmBaseDirective
+from mantiddoc.directives.base import AlgorithmBaseDirective
 
 
 class AliasDirective(AlgorithmBaseDirective):
diff --git a/docs/sphinxext/mantiddoc/directives/categories.py b/docs/sphinxext/mantiddoc/directives/categories.py
index 178c05b633724ba16044b6ad1e95e7e7edcb5b13..2f7574073641615aeb30d286e437dbbeeed01bee 100644
--- a/docs/sphinxext/mantiddoc/directives/categories.py
+++ b/docs/sphinxext/mantiddoc/directives/categories.py
@@ -6,7 +6,7 @@
     creates "index" pages that lists the contents of each category. The display of each
     "index" page is controlled by a jinja2 template.
 """
-from base import AlgorithmBaseDirective, algorithm_name_and_version
+from mantiddoc.directives.base import AlgorithmBaseDirective, algorithm_name_and_version
 from sphinx.util.osutil import relative_uri
 import os
 
diff --git a/docs/sphinxext/mantiddoc/directives/properties.py b/docs/sphinxext/mantiddoc/directives/properties.py
index 6832a06919477252fdeafe8449a42139f69d590b..e5d6343db4ebd631e29d3cb16854157fe45b757b 100644
--- a/docs/sphinxext/mantiddoc/directives/properties.py
+++ b/docs/sphinxext/mantiddoc/directives/properties.py
@@ -1,5 +1,4 @@
-from base import AlgorithmBaseDirective
-import string
+from mantiddoc.directives.base import AlgorithmBaseDirective
 
 
 class PropertiesDirective(AlgorithmBaseDirective):
@@ -138,7 +137,7 @@ class PropertiesDirective(AlgorithmBaseDirective):
         if (direction_string[prop.direction] == "Output") and \
            (not isinstance(prop, IWorkspaceProperty)):
             default_prop = ""
-        elif (prop.isValid == ""):
+        elif prop.isValid == "":
             default_prop = self._create_property_default_string(prop)
         else:
             default_prop = "*Mandatory*"
@@ -161,14 +160,14 @@ class PropertiesDirective(AlgorithmBaseDirective):
         # Convert to int, then float, then any string
         try:
             val = int(default)
-            if (val >= 2147483647):
+            if val >= 2147483647:
                 defaultstr = "*Optional*"
             else:
                 defaultstr = str(val)
         except:
             try:
                 val = float(default)
-                if (val >= 1e+307):
+                if val >= 1e+307:
                     defaultstr = "*Optional*"
                 else:
                     defaultstr = str(val)
diff --git a/docs/sphinxext/mantiddoc/tools/screenshot.py b/docs/sphinxext/mantiddoc/tools/screenshot.py
index e6e5eea328b0e1d2affaefb49dd89ebcffb17b99..ae3fcc38ef56cdf21781dd35b73886696dd37095 100644
--- a/docs/sphinxext/mantiddoc/tools/screenshot.py
+++ b/docs/sphinxext/mantiddoc/tools/screenshot.py
@@ -86,14 +86,14 @@ def custominterface_screenshot(name, directory, ext = ".png", widget_name = None
     dlg = threadsafe_call(iface_mgr.createSubWindow, name, None)
 
     if dlg is None:
-      raise RuntimeError("Interface '%s' could not be created" % name)
+        raise RuntimeError("Interface '%s' could not be created" % name)
 
     if widget_name:
-      widget = dlg.findChild(QWidget, widget_name)
-      if widget is None:
-        raise RuntimeError("Widget '%s' does not exist in interface '%s'" % (widget_name, name))
-      picture = Screenshot(widget, name.replace(' ','_') + "_" + widget_name + "_widget" + ext, directory)
+        widget = dlg.findChild(QWidget, widget_name)
+        if widget is None:
+            raise RuntimeError("Widget '%s' does not exist in interface '%s'" % (widget_name, name))
+        picture = Screenshot(widget, name.replace(' ','_') + "_" + widget_name + "_widget" + ext, directory)
     else:
-      picture = Screenshot(dlg, name.replace(' ','_') + "_interface" + ext, directory)
+        picture = Screenshot(dlg, name.replace(' ','_') + "_interface" + ext, directory)
     threadsafe_call(dlg.close)
     return picture