diff --git a/eos/saveddata/booster.py b/eos/saveddata/booster.py
index 9d0e98ae0..a8c496ae0 100644
--- a/eos/saveddata/booster.py
+++ b/eos/saveddata/booster.py
@@ -105,7 +105,7 @@ class Booster(HandledItem, ItemAttrShortcut):
 
     def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
         if forceProjected: return
-        if self.active == False: return
+        if not self.active: return
         for effect in self.item.effects.itervalues():
             if effect.runTime == runTime and effect.isType("passive"):
                 effect.handler(fit, self, ("booster",))
@@ -122,7 +122,7 @@ class Booster(HandledItem, ItemAttrShortcut):
                "active" : lambda val: isinstance(val, bool),
                "slot" : lambda val: isinstance(val, int) and val >= 1 and val <= 3}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def __deepcopy__(self, memo):
diff --git a/eos/saveddata/cargo.py b/eos/saveddata/cargo.py
index 676b7cebf..ea90d6f8a 100644
--- a/eos/saveddata/cargo.py
+++ b/eos/saveddata/cargo.py
@@ -71,7 +71,7 @@ class Cargo(HandledItem, ItemAttrShortcut):
         map = {"fitID": lambda val: isinstance(val, int),
                "itemID" : lambda val: isinstance(val, int)}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def __deepcopy__(self, memo):
diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index 1f5832ea2..a0b56c2f8 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -243,7 +243,7 @@ class Character(object):
                "apiKey" : lambda val: val is None or (isinstance(val, basestring) and len(val) > 0),
                "ownerID" : lambda val: isinstance(val, int) or val is None}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def __repr__(self):
@@ -354,7 +354,7 @@ class Skill(HandledItem):
         map = {"characterID": lambda val: isinstance(val, int),
                "skillID" : lambda val: isinstance(val, int)}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def __deepcopy__(self, memo):
diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py
index 8033384ab..29e05d41e 100644
--- a/eos/saveddata/drone.py
+++ b/eos/saveddata/drone.py
@@ -185,7 +185,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                "amount" : lambda val: isinstance(val, int) and val >= 0,
                "amountActive" : lambda val: isinstance(val, int) and val <= self.amount and val >= 0}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def clear(self):
diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index bc96c5f10..5043f1ad6 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -219,7 +219,7 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                "amount" : lambda val: isinstance(val, int) and val >= -1,
                }
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def clear(self):
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index a3000267f..62064c0a7 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -364,7 +364,7 @@ class Fit(object):
                "ownerID" : lambda val: isinstance(val, int) or val is None,
                "shipID" : lambda val: isinstance(val, int) or val is None}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def clear(self, projected=False):
diff --git a/eos/saveddata/fleet.py b/eos/saveddata/fleet.py
index 12c1e78f1..780301968 100644
--- a/eos/saveddata/fleet.py
+++ b/eos/saveddata/fleet.py
@@ -41,7 +41,7 @@ class Fleet(object):
             self.broken = True
 
         #Now calculate our own if we aren't broken
-        if self.broken == False:
+        if not self.broken:
             #We only get our own bonuses *Sadface*
             store.apply(leader, "fleet")
 
@@ -104,7 +104,7 @@ class Wing(object):
             self.broken = True
 
         #Check if we aren't broken, if we aren't, boost
-        if self.broken == False:
+        if not self.broken:
             store.apply(leader, "wing")
         else:
             #We broke, don't go up
@@ -165,7 +165,7 @@ class Squad(object):
         if len(self.members) <= 0 or leader is None or leader.character is None or leader.character.getSkill("Leadership").level * 2 < len(self.members):
             self.broken = True
 
-        if self.broken == False:
+        if not self.broken:
             for member in self.members:
                 store.apply(member, "squad")
         else:
diff --git a/eos/saveddata/implant.py b/eos/saveddata/implant.py
index a4a6de74d..a368e9714 100644
--- a/eos/saveddata/implant.py
+++ b/eos/saveddata/implant.py
@@ -86,7 +86,7 @@ class Implant(HandledItem, ItemAttrShortcut):
 
     def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
         if forceProjected: return
-        if self.active == False: return
+        if not self.active: return
         for effect in self.item.effects.itervalues():
             if effect.runTime == runTime and effect.isType("passive"):
                 effect.handler(fit, self, ("implant",))
@@ -97,7 +97,7 @@ class Implant(HandledItem, ItemAttrShortcut):
                "itemID" : lambda val: isinstance(val, int),
                "active": lambda val: isinstance(val, bool)}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def __deepcopy__(self, memo):
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 7cc186c19..1384b4edf 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -561,7 +561,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                "itemID" : lambda val: val is None or isinstance(val, int),
                "ammoID" : lambda val: isinstance(val, int)}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val
 
     def clear(self):
diff --git a/eos/saveddata/user.py b/eos/saveddata/user.py
index 1baeb93ce..26144feb0 100644
--- a/eos/saveddata/user.py
+++ b/eos/saveddata/user.py
@@ -50,5 +50,5 @@ class User(object):
                "password" : lambda val: isinstance(val, basestring) and len(val) == 96,
                "admin" : lambda val: isinstance(val, bool)}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
+        if not map[key](val): raise ValueError(str(val) + " is not a valid value for " + key)
         else: return val