diff --git a/lib/core/option.py b/lib/core/option.py
index 2c10417ef..bf44b7a58 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -539,6 +539,8 @@ def __setTamperingFunctions():
         for tfile in conf.tamper.split(','):
             found = False
 
+            tfile = tfile.strip()
+
             if not tfile:
                 continue
 
@@ -943,9 +945,6 @@ def __cleanupOptions():
     else:
         conf.testParameter = []
 
-    if conf.tamper:
-        conf.tamper = conf.tamper.replace(" ", "")
-
     if conf.db:
         conf.db = conf.db.replace(" ", "")
 
diff --git a/tamper/randomcase.py b/tamper/randomcase.py
index b5fc465fd..d0e536dc2 100644
--- a/tamper/randomcase.py
+++ b/tamper/randomcase.py
@@ -33,7 +33,7 @@ def tamper(place, value):
                 newWord = str()
 
                 for i in xrange(len(word)):
-                    newWord += word[i].upper() if randomRange(0,1) else word[i].lower()
+                    newWord += word[i].upper() if randomRange(0, 1) else word[i].lower()
 
                 retVal = retVal.replace(word, newWord)
 
diff --git a/tamper/randomcomments.py b/tamper/randomcomments.py
index 0f78f70fa..59e5c59f3 100644
--- a/tamper/randomcomments.py
+++ b/tamper/randomcomments.py
@@ -36,7 +36,7 @@ def tamper(place, value):
                 newWord = word[0]
 
                 for i in xrange(1, len(word) - 1):
-                    newWord += "%s%s" % ("/**/" if randomRange(0,1) else "", word[i])
+                    newWord += "%s%s" % ("/**/" if randomRange(0, 1) else "", word[i])
 
                 newWord += word[-1]
                 retVal = retVal.replace(word, newWord)