diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 5015e8df25e4e060ce129bfa83a33d6113b86299..8a7ad6b0e4ef6dbcc12dffc2d59f23b797db16f6 100644
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -98,7 +98,7 @@ class Error(Exception):
 
     def str_debug(self, e):
         out = []
-        if not "exc" in e or not e["exc"]:
+        if not e.get("exc"):
             return ""
         exc_tb = e["exc"][2]
         if exc_tb:
@@ -1153,7 +1153,7 @@ class WardenHandler(ObjectBase):
                 errs.extend(self.add_event_nums([i], events, node_errs))
                 continue
 
-            if self.req.client.test and not 'Test' in event.get('Category', []):
+            if self.req.client.test and 'Test' not in event.get('Category', []):
                 errs.extend(
                     self.add_event_nums([i], events, [{
                         "error": 422,
@@ -1190,14 +1190,14 @@ class WardenHandler(ObjectBase):
 def read_ini(path):
     c = ConfigParser.RawConfigParser()
     res = c.read(path)
-    if not res or not path in res:
+    if not res or path not in res:
         # We don't have loggin yet, hopefully this will go into webserver log
         raise Error(message="Unable to read config: %s" % path)
     data = {}
     for sect in c.sections():
         for opts in c.options(sect):
             lsect = sect.lower()
-            if not lsect in data:
+            if lsect not in data:
                 data[lsect] = {}
             data[lsect][opts] = c.get(sect, opts)
     return data
@@ -1490,26 +1490,26 @@ def modify_client(**kwargs):
     if kwargs["name"] is not None:
         kwargs["name"] = kwargs["name"].lower()
         if not isValidNSID(kwargs["name"]):
-            print("Invalid client name \"%s\"." % (kwargs["name"]), file=sys.stderr)
+            print("Invalid client name \"%s\"." % kwargs["name"], file=sys.stderr)
             return 254
 
     if kwargs["hostname"] is not None:
         kwargs["hostname"] = kwargs["hostname"].lower()
         if not isValidHostname(kwargs["hostname"]):
-            print("Invalid hostname \"%s\"." % (kwargs["hostname"]), file=sys.stderr)
+            print("Invalid hostname \"%s\"." % kwargs["hostname"], file=sys.stderr)
             return 253
 
     if kwargs["requestor"] is not None and not isValidEmail(kwargs["requestor"]):
-        print("Invalid requestor email \"%s\"." % (kwargs["requestor"]), file=sys.stderr)
+        print("Invalid requestor email \"%s\"." % kwargs["requestor"], file=sys.stderr)
         return 252
 
     if kwargs["id"] is not None and not isValidID(kwargs["id"]):
-        print("Invalid id \"%s\"." % (kwargs["id"]), file=sys.stderr)
+        print("Invalid id \"%s\"." % kwargs["id"], file=sys.stderr)
         return 251
 
     for c in server.handler.db.get_clients():
         if kwargs["name"] is not None and kwargs["name"].lower() == c.name:
-            print("Clash with existing name: %s" % (str(c)), file=sys.stderr)
+            print("Clash with existing name: %s" % str(c), file=sys.stderr)
             return 250
         if kwargs["secret"] is not None and kwargs["secret"] == c.secret:
             print("Clash with existing secret: %s" % str(c), file=sys.stderr)
@@ -1530,10 +1530,10 @@ def purge(days=30, lastlog=None, events=None):
         lastlog = events = True
     if lastlog:
         count = server.handler.db.purge_lastlog(days)
-        print("Purged %d lastlog entries." % (count))
+        print("Purged %d lastlog entries." % count)
     if events:
         count = server.handler.db.purge_events(days)
-        print("Purged %d events." % (count))
+        print("Purged %d events." % count)
     return 0