diff --git a/docs/sphinxext/mantiddoc/directives/algorithm.py b/docs/sphinxext/mantiddoc/directives/algorithm.py
index a7d92a9a18dcf2f2fcee0c44fe281433e1d5ff40..e01645c182f245813f77a10fedcaa153b782c8d7 100644
--- a/docs/sphinxext/mantiddoc/directives/algorithm.py
+++ b/docs/sphinxext/mantiddoc/directives/algorithm.py
@@ -1,7 +1,4 @@
 from mantiddoc.directives.base import AlgorithmBaseDirective
-from docutils import nodes
-from sphinx.locale import _
-from sphinx.util.compat import make_admonition
 import os
 import re
 
diff --git a/docs/sphinxext/mantiddoc/directives/attributes.py b/docs/sphinxext/mantiddoc/directives/attributes.py
index 2c224b2d79852b628654509419dc9e1e5c48efc3..3f45b202129a686f71c19b224fbe38a4c3a3da49 100644
--- a/docs/sphinxext/mantiddoc/directives/attributes.py
+++ b/docs/sphinxext/mantiddoc/directives/attributes.py
@@ -1,6 +1,4 @@
-from properties import PropertiesDirective
-import string
-
+from mantiddoc.directives.properties import PropertiesDirective
 
 class AttributesDirective(PropertiesDirective):
 
diff --git a/docs/sphinxext/mantiddoc/directives/diagram.py b/docs/sphinxext/mantiddoc/directives/diagram.py
index e9fd957acb915fbaef50a8af7fbd0dac8d43d6df..2ae58bf405afd010544e691a801fa727ced7399f 100644
--- a/docs/sphinxext/mantiddoc/directives/diagram.py
+++ b/docs/sphinxext/mantiddoc/directives/diagram.py
@@ -1,4 +1,4 @@
-from base import BaseDirective
+from mantiddoc.directives.base import BaseDirective
 from sphinx.locale import _
 import os, string, subprocess
 
diff --git a/docs/sphinxext/mantiddoc/directives/interface.py b/docs/sphinxext/mantiddoc/directives/interface.py
index 531e6297162a747d64b7dea005e2099b69dd85d7..42dbbaef231993cf19b5f83fb1fcad2809f6e6c7 100644
--- a/docs/sphinxext/mantiddoc/directives/interface.py
+++ b/docs/sphinxext/mantiddoc/directives/interface.py
@@ -1,5 +1,4 @@
-from base import BaseDirective
-from sphinx.locale import _
+from mantiddoc.directives.base import BaseDirective
 import os
 
 class InterfaceDirective(BaseDirective):
diff --git a/docs/sphinxext/mantiddoc/directives/sourcelink.py b/docs/sphinxext/mantiddoc/directives/sourcelink.py
index 8ff7598f5290b338d98fd45c75198c6f80274f1d..1d75ba89c4775243cab7f01a4beb2c3f9c26efb5 100644
--- a/docs/sphinxext/mantiddoc/directives/sourcelink.py
+++ b/docs/sphinxext/mantiddoc/directives/sourcelink.py
@@ -87,7 +87,7 @@ class SourceLinkDirective(AlgorithmBaseDirective):
             raise SourceLinkError(error_string)
 
         try:
-            self.output_to_page(file_paths,file_name,sanity_checks);
+            self.output_to_page(file_paths,file_name,sanity_checks)
         except SourceLinkError as err:
             error_string += str(err) + "\n"
 
diff --git a/docs/sphinxext/mantiddoc/directives/summary.py b/docs/sphinxext/mantiddoc/directives/summary.py
index cb0403e75fe1f092343fbfb26867452cd0b95583..71870dc64b418cfa06419eadf0eccb074e92664e 100644
--- a/docs/sphinxext/mantiddoc/directives/summary.py
+++ b/docs/sphinxext/mantiddoc/directives/summary.py
@@ -1,4 +1,4 @@
-from base import AlgorithmBaseDirective
+from mantiddoc.directives.base import AlgorithmBaseDirective
 
 
 class SummaryDirective(AlgorithmBaseDirective):
diff --git a/docs/sphinxext/mantiddoc/doctest.py b/docs/sphinxext/mantiddoc/doctest.py
index 3bd4bea3581dcdcfd5a281f716c43a475eca4ae0..e4364825320559fc06647688164ba4025b609d72 100644
--- a/docs/sphinxext/mantiddoc/doctest.py
+++ b/docs/sphinxext/mantiddoc/doctest.py
@@ -172,8 +172,10 @@ class TestSuiteReport(object):
     @property
     def nfailed(self):
         def sum_failure(fails, case):
-            if case.failed: return fails + 1
-            else: return fails
+            if case.failed:
+                return fails + 1
+            else:
+                return fails
         return reduce(sum_failure, self.testcases, 0)
 
     @property