diff --git a/lib/core/option.py b/lib/core/option.py
index 28bf162f3..ea35341af 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1373,7 +1373,7 @@ def _setHTTPUserAgent():
         infoMsg = "fetched random HTTP User-Agent header from "
         infoMsg += "file '%s': '%s'" % (paths.USER_AGENTS, userAgent)
         logger.info(infoMsg)
-        
+
         conf.httpHeaders.append((HTTP_HEADER.USER_AGENT, userAgent))
 
 def _setHTTPReferer():
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
index 42e36deb9..dc8c23282 100644
--- a/lib/techniques/union/use.py
+++ b/lib/techniques/union/use.py
@@ -277,7 +277,7 @@ def unionUse(expression, unpack=True, dump=False):
                             with kb.locks.value:
                                 if all(map(lambda _: _ in output, (kb.chars.start, kb.chars.stop))):
                                     items = parseUnionPage(output)
- 
+
                                     if threadData.shared.showEta:
                                         threadData.shared.progress.progress(time.time() - valueStart, threadData.shared.counter)
                                     if isListLike(items):
diff --git a/lib/utils/xrange.py b/lib/utils/xrange.py
index 142d50a56..0e988be39 100644
--- a/lib/utils/xrange.py
+++ b/lib/utils/xrange.py
@@ -28,7 +28,7 @@ class xrange(object):
             self._slice = slice(*args)
         if self._slice.stop is None:
             raise TypeError("xrange stop must not be None")
-        
+
     @property
     def start(self):
         if self._slice.start is not None:
@@ -75,10 +75,10 @@ class xrange(object):
                 fixed_index = index + self._len()
             else:
                 fixed_index = index
-                
+
             if not 0 <= fixed_index < self._len():
                 raise IndexError("Index %d out of %r" % (index, self))
-            
+
             return self._index(fixed_index)
         else:
             raise TypeError("xrange indices must be slices or integers")
diff --git a/plugins/dbms/db2/enumeration.py b/plugins/dbms/db2/enumeration.py
index b09e64003..6f6ec2203 100644
--- a/plugins/dbms/db2/enumeration.py
+++ b/plugins/dbms/db2/enumeration.py
@@ -12,7 +12,7 @@ from plugins.generic.enumeration import Enumeration as GenericEnumeration
 class Enumeration(GenericEnumeration):
     def __init__(self):
         GenericEnumeration.__init__(self)
-    
+
     def getPasswordHashes(self):
         warnMsg = "on DB2 it is not possible to list password hashes"
         logger.warn(warnMsg)
diff --git a/plugins/dbms/hsqldb/fingerprint.py b/plugins/dbms/hsqldb/fingerprint.py
index ecc194633..1b58fc356 100644
--- a/plugins/dbms/hsqldb/fingerprint.py
+++ b/plugins/dbms/hsqldb/fingerprint.py
@@ -77,7 +77,7 @@ class Fingerprint(GenericFingerprint):
         version 1.8.0.4 Added org.hsqldbdb.Library function, getDatabaseFullProductVersion to return the
                         full version string, including the 4th digit (e.g 1.8.0.4).
         version 1.7.2 CASE statements added and INFORMATION_SCHEMA
-         
+
         """
 
         if not conf.extensiveFp and (Backend.isDbmsWithin(HSQLDB_ALIASES) \
diff --git a/tamper/between.py b/tamper/between.py
index e7f3d4014..f2e0f91bf 100644
--- a/tamper/between.py
+++ b/tamper/between.py
@@ -54,6 +54,6 @@ def tamper(payload, **kwargs):
             if match:
                 _ = "%s %s BETWEEN %s AND %s" % (match.group(2), match.group(4), match.group(5), match.group(5))
                 retVal = retVal.replace(match.group(0), _)
-            
+
 
     return retVal
diff --git a/thirdparty/colorama/winterm.py b/thirdparty/colorama/winterm.py
index ae22c4658..6d17c2cdc 100644
--- a/thirdparty/colorama/winterm.py
+++ b/thirdparty/colorama/winterm.py
@@ -73,7 +73,7 @@ class WinTerm(object):
         position.X += 1
         position.Y += 1
         return position
-    
+
     def set_cursor_position(self, position=None, on_stderr=False):
         if position is None:
             #I'm not currently tracking the position, so there is no default.