diff --git a/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py b/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
index 8d73f4a61ef8..3a4d057be909 100644
--- a/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
+++ b/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoMaps_B1.py
@@ -16,7 +16,7 @@
 # Set initial parameters for peak finding
 ExpectedHeight = -1000.0 # Expected Height of Gaussian Peaks (initial value of fit parameter)
 ExpectedWidth = 8.0 # Expected width of Gaussian peaks in pixels  (initial value of fit parameter)
-ExpectedPositions = [4.0, 85.0, 128.0, 161.0, 252.0] 
+ExpectedPositions = [4.0, 85.0, 128.0, 161.0, 252.0]
 # Expected positions of the edges and Gaussian peaks in pixels (initial values of fit parameters)
 
 # Set what we want to calibrate (e.g whole intrument or one door )
diff --git a/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py b/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
index f704352ba7d3..85711023f698 100644
--- a/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
+++ b/Code/Mantid/scripts/Calibration/Examples/TubeCalibDemoWish_5panels.py
@@ -18,7 +18,7 @@
 from tube_spec import TubeSpec
 
 
-def CalibrateWish( run_per_panel_list):
+def CalibrateWish(run_per_panel_list):
     '''
     :param run_per_panel_list: is a list of tuples with the run number and the associated panel
 
diff --git a/Code/Mantid/scripts/Calibration/tube_calib_fit_params.py b/Code/Mantid/scripts/Calibration/tube_calib_fit_params.py
index 3610244e9a7a..3a2ccca35605 100644
--- a/Code/Mantid/scripts/Calibration/tube_calib_fit_params.py
+++ b/Code/Mantid/scripts/Calibration/tube_calib_fit_params.py
@@ -1,7 +1,7 @@
 from mantid.simpleapi import *
 from mantid.kernel import *
 
-class TubeCalibFitParams:
+class TubeCalibFitParams(object):
 
 # This class is to take the fitting method and parameters for fitting the peaks crated by the calibration slits etc
 # and to deliver them to TubeCalib, so it can fit the peaks appropriately
diff --git a/Code/Mantid/scripts/Calibration/tube_spec.py b/Code/Mantid/scripts/Calibration/tube_spec.py
index 8b71923e42d4..64fcc9642109 100644
--- a/Code/Mantid/scripts/Calibration/tube_spec.py
+++ b/Code/Mantid/scripts/Calibration/tube_spec.py
@@ -108,7 +108,7 @@ def isTube(self, comp):
         """
         # We simply assume it's a tube if it has a large number of children
         if  hasattr( comp, "nelements"):
-            return comp.nelements() >= self.minNumDetsInTube 
+            return comp.nelements() >= self.minNumDetsInTube
         else:
             return False
 
diff --git a/Code/Mantid/scripts/CrystalTools/PeakReport.py b/Code/Mantid/scripts/CrystalTools/PeakReport.py
index eb435047225e..c7a28c6c3e59 100644
--- a/Code/Mantid/scripts/CrystalTools/PeakReport.py
+++ b/Code/Mantid/scripts/CrystalTools/PeakReport.py
@@ -9,7 +9,7 @@
 from reportlab.lib.styles import getSampleStyleSheet
 from reportlab.platypus import *
 
-class PeakReport:
+class PeakReport(object):
     """
     Peak Report is a class used to creating one or more peak integration reports as PDFs.
     """
diff --git a/Code/Mantid/scripts/Engineering/EnginXUtils.py b/Code/Mantid/scripts/Engineering/EnginXUtils.py
index 6ca38533361e..26a6d6e9c505 100644
--- a/Code/Mantid/scripts/Engineering/EnginXUtils.py
+++ b/Code/Mantid/scripts/Engineering/EnginXUtils.py
@@ -43,4 +43,3 @@ def isIndexInBank(index):
 
     return filter(isIndexInBank, range(0, ws.getNumberHistograms()))
 
-
diff --git a/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py b/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
index a2e86978f080..cc246846f9aa 100644
--- a/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
+++ b/Code/Mantid/scripts/FilterEvents/eventFilterGUI.py
@@ -1,7 +1,7 @@
 #pylint: disable=invalid-name
 import numpy
 
-from Ui_MainWindow import Ui_MainWindow #import line for the UI python class
+from FilterEvents.Ui_MainWindow import Ui_MainWindow #import line for the UI python class
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -33,7 +33,7 @@ class MyPopErrorMsg(QWidget):
     def __init__(self):
         """ Init
         """
-        import Ui_ErrorMessage as errui
+        import FilterEvents.Ui_ErrorMessage as errui
         QWidget.__init__(self)
 
 
@@ -58,10 +58,10 @@ def quit(self):
 
         return
 
-    def XpaintEvent(self, e):
+    def XpaintEvent(self, _):
         """ ???
         """
-        import Ui_ErrorMessage as errui
+        import FilterEvents.Ui_ErrorMessage as errui
 
         self.ui = errui.Ui_Dialog()
         self.ui.setupUi(self)
@@ -107,6 +107,8 @@ class MainWindow(QtGui.QMainWindow):
 
     """
 
+    _errMsgWindow = None
+
     def __init__(self, parent=None):
         """ Intialization and set up
         """
@@ -445,8 +447,8 @@ def set_stopTime(self):
 
         # Correct value
         resetT = True
-        if irightvalue >= 100:
-            irightvalue == 100
+        if irightvalue > 100:
+            irightvalue = 100
         elif irightvalue < self._leftSlideValue:
             irightvalue = self._leftSlideValue
         else:
diff --git a/Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py b/Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py
index b4c1ed622716..102426faa1ce 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/NonIDF_Properties.py
@@ -1,6 +1,6 @@
 #pylint: disable=invalid-name
-from PropertiesDescriptors import *
-from RunDescriptor import RunDescriptor,RunDescriptorDependent
+from Direct.PropertiesDescriptors import *
+from Direct.RunDescriptor import RunDescriptor,RunDescriptorDependent
 
 
 class NonIDF_Properties(object):
diff --git a/Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py b/Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py
index b8494f8a5eb5..0459aa0c1819 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/PropertiesDescriptors.py
@@ -556,6 +556,8 @@ def _parce_string2list(self,val):
 #-----------------------------------------------------------------------------------------
 class PropertyFromRange(PropDescriptor):
     """ Descriptor for property, which can have one value from a list of values """
+    _current_value = None
+
     def __init__(self,availible_values,default_value):
         self._availible_values = availible_values
         self.__set__(None,default_value)
diff --git a/Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py b/Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
index 5ab7fe6d8978..33c518c10e4c 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/PropertyManager.py
@@ -1,5 +1,5 @@
 #pylint: disable=invalid-name
-from NonIDF_Properties import *
+from Direct.NonIDF_Properties import *
 
 from collections import OrderedDict
 
diff --git a/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py b/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
index ee28a46f9c19..e18d3e1aa7de 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -3,7 +3,7 @@
 from mantid import config,api
 from mantid.kernel import funcreturns
 
-from PropertyManager import PropertyManager
+from Direct.PropertyManager import PropertyManager
 # this import is used by children
 from Direct.DirectEnergyConversion import DirectEnergyConversion
 #import inspect
diff --git a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
index 6b61fbc53dbf..edddf86fb180 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
@@ -3,7 +3,7 @@
 
 
 from mantid.simpleapi import *
-from PropertiesDescriptors import *
+from Direct.PropertiesDescriptors import *
 import re
 
 
@@ -701,4 +701,4 @@ def __set__(self,instance,value):
     #        DeleteWorkspace(self._ws_name)
     #    object.__del__(self)
 
-  
\ No newline at end of file
+  
diff --git a/Code/Mantid/scripts/Inelastic/Direct/dgreduce.py b/Code/Mantid/scripts/Inelastic/Direct/dgreduce.py
index 2c9d4ca926b0..9b4c61b5bcc3 100644
--- a/Code/Mantid/scripts/Inelastic/Direct/dgreduce.py
+++ b/Code/Mantid/scripts/Inelastic/Direct/dgreduce.py
@@ -1,6 +1,6 @@
 #pylint: disable=invalid-name
 """ Empty class temporary left for compatibility with previous interfaces """
-import DirectEnergyConversion as DRC
+import Direct.DirectEnergyConversion as DRC
 from mantid.simpleapi import *
 from mantid.kernel import funcreturns
 
diff --git a/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py b/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py
index bf7fe6d626d9..af6f9f98bd8b 100644
--- a/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py
+++ b/Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py
@@ -69,5 +69,6 @@ def getStringProperty(workspace, property):
     inst = mantid.AnalysisDataService[workspace].getInstrument()
     try:
         prop = inst.getStringParameter(property)[0]
-    except IndexError: return ""
+    except IndexError:
+        return ""
     return prop
diff --git a/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
index 477210de2277..efee01eca620 100644
--- a/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
+++ b/Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py
@@ -34,8 +34,10 @@ def loadData(rawfiles, outWS='RawFile', Sum=False, SpecMin=-1, SpecMax=-1,\
         return workspaces
 
 def createMappingFile(groupFile, ngroup, nspec, first):
-    if  ngroup == 1 : return 'All'
-    if  nspec == 1 : return 'Individual'
+    if ngroup == 1:
+        return 'All'
+    if nspec == 1:
+        return 'Individual'
     filename = config['defaultsave.directory']
     filename = os.path.join(filename, groupFile)
     handle = open(filename, 'w')
diff --git a/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py b/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
index d0248d8f88e9..70bec0c356c9 100644
--- a/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
+++ b/Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
@@ -35,6 +35,7 @@ class LoadData(ReductionStep):
     _data_files = {}
     _extra_load_opts = {}
     _contains_event_data = False
+    _reducer = None
 
     def __init__(self):
         """Initialise the ReductionStep. Constructor should set the initial
diff --git a/Code/Mantid/scripts/Inelastic/msg_reducer.py b/Code/Mantid/scripts/Inelastic/msg_reducer.py
index df597f58c3dd..fe8a132e8758 100644
--- a/Code/Mantid/scripts/Inelastic/msg_reducer.py
+++ b/Code/Mantid/scripts/Inelastic/msg_reducer.py
@@ -26,6 +26,8 @@ class MSGReducer(reducer.Reducer):
     _save_formats = []
     _info_table_props = None
     _extra_load_opts = {}
+    _reduction_steps = None
+    _data_files = None
 
     def __init__(self):
         super(MSGReducer, self).__init__()