diff --git a/eos/db/saveddata/__init__.py b/eos/db/saveddata/__init__.py
index c97707f68..d409e8ca7 100644
--- a/eos/db/saveddata/__init__.py
+++ b/eos/db/saveddata/__init__.py
@@ -17,4 +17,3 @@ __all__ = [
     "implantSet",
     "loadDefaultDatabaseValues"
 ]
-
diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py
index a31904b12..3a6334985 100644
--- a/eos/db/saveddata/booster.py
+++ b/eos/db/saveddata/booster.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,25 +15,26 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, ForeignKey, Integer, UniqueConstraint, Boolean
-from sqlalchemy.orm import mapper, relation
+from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
 from eos.types import Booster
 
 boosters_table = Table("boosters", saveddata_meta,
-                       Column("ID", Integer, primary_key = True),
+                       Column("ID", Integer, primary_key=True),
                        Column("itemID", Integer),
-                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
                        Column("active", Boolean),
                        )
 
 activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),
-                                Column("effectID", Integer, primary_key = True))
+                                Column("boosterID", ForeignKey("boosters.ID"), primary_key=True),
+                                Column("effectID", Integer, primary_key=True))
+
 
 class ActiveSideEffectsDummy(object):
     def __init__(self, effectID):
@@ -42,6 +43,6 @@ class ActiveSideEffectsDummy(object):
 
 mapper(ActiveSideEffectsDummy, activeSideEffects_table)
 mapper(Booster, boosters_table,
-       properties = {"_Booster__activeSideEffectDummies" : relation(ActiveSideEffectsDummy)})
+       properties={"_Booster__activeSideEffectDummies": relation(ActiveSideEffectsDummy)})
 
 Booster._Booster__activeSideEffectIDs = association_proxy("_Booster__activeSideEffectDummies", "effectID")
diff --git a/eos/db/saveddata/cargo.py b/eos/db/saveddata/cargo.py
index deabd3b2e..d4b829777 100644
--- a/eos/db/saveddata/cargo.py
+++ b/eos/db/saveddata/cargo.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,18 +15,18 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
+from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
 from eos.types import Cargo
 
 cargo_table = Table("cargo", saveddata_meta,
-                     Column("ID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("amount", Integer, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                    Column("itemID", Integer, nullable=False),
+                    Column("amount", Integer, nullable=False))
 
-mapper(Cargo, cargo_table)
\ No newline at end of file
+mapper(Cargo, cargo_table)
diff --git a/eos/db/saveddata/character.py b/eos/db/saveddata/character.py
index e6be52535..fad8c579d 100644
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,44 +15,44 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import relation, mapper
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
-from eos.types import Character, User, Skill, Implant
 from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.types import Character, User, Skill, Implant
 
 characters_table = Table("characters", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False),
+                         Column("ID", Integer, primary_key=True),
+                         Column("name", String, nullable=False),
                          Column("apiID", Integer),
                          Column("apiKey", String),
                          Column("defaultChar", Integer),
-                         Column("chars", String, nullable = True),
+                         Column("chars", String, nullable=True),
                          Column("defaultLevel", Integer, nullable=True),
-                         Column("ownerID", ForeignKey("users.ID"), nullable = True))
+                         Column("ownerID", ForeignKey("users.ID"), nullable=True))
 
 mapper(Character, characters_table,
-        properties = {
-            "savedName": characters_table.c.name,
-            "_Character__owner": relation(
-                User,
-                backref = "characters"),
-            "_Character__skills": relation(
-                Skill,
-                backref="character",
-                cascade = "all,delete-orphan"),
-            "_Character__implants": relation(
-                Implant,
-                collection_class = HandledImplantBoosterList,
-                cascade='all,delete-orphan',
-                backref='character',
-                single_parent=True,
-                primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
-                secondaryjoin = charImplants_table.c.implantID == Implant.ID,
-                secondary = charImplants_table),
-        }
-)
+       properties={
+           "savedName": characters_table.c.name,
+           "_Character__owner": relation(
+               User,
+               backref="characters"),
+           "_Character__skills": relation(
+               Skill,
+               backref="character",
+               cascade="all,delete-orphan"),
+           "_Character__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all,delete-orphan',
+               backref='character',
+               single_parent=True,
+               primaryjoin=charImplants_table.c.charID == characters_table.c.ID,
+               secondaryjoin=charImplants_table.c.implantID == Implant.ID,
+               secondary=charImplants_table),
+       }
+       )
diff --git a/eos/db/saveddata/crest.py b/eos/db/saveddata/crest.py
index 0934f177e..2cbeeb44a 100644
--- a/eos/db/saveddata/crest.py
+++ b/eos/db/saveddata/crest.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +15,17 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, String, Boolean
+from sqlalchemy import Table, Column, Integer, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
 from eos.types import CrestChar
 
 crest_table = Table("crest", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False, unique = True),
-                         Column("refresh_token", String, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("name", String, nullable=False, unique=True),
+                    Column("refresh_token", String, nullable=False))
 
 mapper(CrestChar, crest_table)
diff --git a/eos/db/saveddata/damagePattern.py b/eos/db/saveddata/damagePattern.py
index c29fa7754..a9e59f228 100644
--- a/eos/db/saveddata/damagePattern.py
+++ b/eos/db/saveddata/damagePattern.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import mapper
@@ -24,7 +24,7 @@ from eos.db import saveddata_meta
 from eos.types import DamagePattern
 
 damagePatterns_table = Table("damagePatterns", saveddata_meta,
-                             Column("ID", Integer, primary_key = True),
+                             Column("ID", Integer, primary_key=True),
                              Column("name", String),
                              Column("emAmount", Integer),
                              Column("thermalAmount", Integer),
diff --git a/eos/db/saveddata/drone.py b/eos/db/saveddata/drone.py
index 94d7e898b..7163c06ff 100644
--- a/eos/db/saveddata/drone.py
+++ b/eos/db/saveddata/drone.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,19 +15,20 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
+
 from eos.db import saveddata_meta
 from eos.types import Drone
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("amount", Integer, nullable = False),
-                     Column("amountActive", Integer, nullable = False),
-                     Column("projected", Boolean, default = False))
+                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                     Column("itemID", Integer, nullable=False),
+                     Column("amount", Integer, nullable=False),
+                     Column("amountActive", Integer, nullable=False),
+                     Column("projected", Boolean, default=False))
 
 mapper(Drone, drones_table)
diff --git a/eos/db/saveddata/fighter.py b/eos/db/saveddata/fighter.py
index 2f4089756..7074369da 100644
--- a/eos/db/saveddata/fighter.py
+++ b/eos/db/saveddata/fighter.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,38 +15,36 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import *
+
 from eos.db import saveddata_meta
 from eos.types import Fighter, Fit
-from sqlalchemy.orm import *
-from sqlalchemy.sql import and_
-from eos.effectHandlerHelpers import *
 from eos.types import FighterAbility
 
-
 fighters_table = Table("fighters", saveddata_meta,
-                     Column("groupID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("active", Boolean, nullable=True),
-                     Column("amount", Integer, nullable = False),
-                     Column("projected", Boolean, default = False))
+                       Column("groupID", Integer, primary_key=True),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                       Column("itemID", Integer, nullable=False),
+                       Column("active", Boolean, nullable=True),
+                       Column("amount", Integer, nullable=False),
+                       Column("projected", Boolean, default=False))
 
 fighter_abilities_table = Table("fightersAbilities", saveddata_meta,
-                     Column("groupID", Integer, ForeignKey("fighters.groupID"), primary_key=True, index = True),
-                     Column("effectID", Integer, nullable = False, primary_key=True),
-                     Column("active", Boolean, default = False))
+                                Column("groupID", Integer, ForeignKey("fighters.groupID"), primary_key=True,
+                                       index=True),
+                                Column("effectID", Integer, nullable=False, primary_key=True),
+                                Column("active", Boolean, default=False))
 
 mapper(Fighter, fighters_table,
-       properties = {
-            "owner": relation(Fit),
-            "_Fighter__abilities": relation(
-                FighterAbility,
-                backref="fighter",
-                cascade='all, delete, delete-orphan'),
+       properties={
+           "owner": relation(Fit),
+           "_Fighter__abilities": relation(
+               FighterAbility,
+               backref="fighter",
+               cascade='all, delete, delete-orphan'),
        })
 
 mapper(FighterAbility, fighter_abilities_table)
diff --git a/eos/db/saveddata/fit.py b/eos/db/saveddata/fit.py
index 060d7b2a1..40b92af04 100644
--- a/eos/db/saveddata/fit.py
+++ b/eos/db/saveddata/fit.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,43 +15,45 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import *
-from sqlalchemy.orm import *
-from sqlalchemy.sql import and_
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import *
 from sqlalchemy.orm.collections import attribute_mapped_collection
+from sqlalchemy.sql import and_
 
 from eos.db import saveddata_meta
-from eos.db.saveddata.module import modules_table
+from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.fighter import fighters_table
-from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, TargetResists, ImplantLocation
+from eos.db.saveddata.module import modules_table
 from eos.effectHandlerHelpers import *
+from eos.types import Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, \
+    TargetResists, ImplantLocation
 
 fits_table = Table("fits", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
-                         Column("shipID", Integer, nullable = False, index = True),
-                         Column("name", String, nullable = False),
-                         Column("timestamp", Integer, nullable = False),
-                         Column("characterID", ForeignKey("characters.ID"), nullable = True),
-                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0),
-                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
-                         Column("modeID", Integer, nullable=True),
-                         Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
-)
+                   Column("ID", Integer, primary_key=True),
+                   Column("ownerID", ForeignKey("users.ID"), nullable=True, index=True),
+                   Column("shipID", Integer, nullable=False, index=True),
+                   Column("name", String, nullable=False),
+                   Column("timestamp", Integer, nullable=False),
+                   Column("characterID", ForeignKey("characters.ID"), nullable=True),
+                   Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
+                   Column("booster", Boolean, nullable=False, index=True, default=0),
+                   Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
+                   Column("modeID", Integer, nullable=True),
+                   Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
+                   )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
-                            Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("victimID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("amount", Integer, nullable = False, default = 1),
-                            Column("active", Boolean, nullable = False, default = 1),
-)
+                            Column("sourceID", ForeignKey("fits.ID"), primary_key=True),
+                            Column("victimID", ForeignKey("fits.ID"), primary_key=True),
+                            Column("amount", Integer, nullable=False, default=1),
+                            Column("active", Boolean, nullable=False, default=1),
+                            )
+
 
 class ProjectedFit(object):
     def __init__(self, sourceID, source_fit, amount=1, active=True):
@@ -83,6 +85,7 @@ class ProjectedFit(object):
             self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
         )
 
+
 Fit._Fit__projectedFits = association_proxy(
     "victimOf",  # look at the victimOf association...
     "source_fit",  # .. and return the source fits
@@ -90,90 +93,90 @@ Fit._Fit__projectedFits = association_proxy(
 )
 
 mapper(Fit, fits_table,
-        properties = {
-            "_Fit__modules": relation(
-                Module,
-                collection_class=HandledModuleList,
-                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
-                order_by=modules_table.c.position,
-                cascade='all, delete, delete-orphan'),
-            "_Fit__projectedModules": relation(
-                Module,
-                collection_class=HandledProjectedModList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
-            "owner": relation(
-                User,
-                backref="fits"),
-            "itemID": fits_table.c.shipID,
-            "shipID": fits_table.c.shipID,
-            "_Fit__boosters": relation(
-                Booster,
-                collection_class=HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True),
-            "_Fit__drones": relation(
-                Drone,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
-            "_Fit__fighters": relation(
-                Fighter,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),
-            "_Fit__cargo": relation(
-                Cargo,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
-            "_Fit__projectedDrones": relation(
-                Drone,
-                collection_class=HandledProjectedDroneList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
-            "_Fit__projectedFighters": relation(
-                Fighter,
-                collection_class=HandledProjectedDroneList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),
-            "_Fit__implants": relation(
-                Implant,
-                collection_class=HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                backref='fit',
-                single_parent=True,
-                primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
-                secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
-                secondary=fitImplants_table),
-            "_Fit__character": relation(
-                Character,
-                backref="fits"),
-            "_Fit__damagePattern": relation(DamagePattern),
-            "_Fit__targetResists": relation(TargetResists),
-            "projectedOnto": relationship(
-                ProjectedFit,
-                primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
-                backref='source_fit',
-                collection_class=attribute_mapped_collection('victimID'),
-                cascade='all, delete, delete-orphan'),
-            "victimOf": relationship(
-                ProjectedFit,
-                primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
-                backref='victim_fit',
-                collection_class=attribute_mapped_collection('sourceID'),
-                cascade='all, delete, delete-orphan'),
+       properties={
+           "_Fit__modules": relation(
+               Module,
+               collection_class=HandledModuleList,
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
+               order_by=modules_table.c.position,
+               cascade='all, delete, delete-orphan'),
+           "_Fit__projectedModules": relation(
+               Module,
+               collection_class=HandledProjectedModList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
+           "owner": relation(
+               User,
+               backref="fits"),
+           "itemID": fits_table.c.shipID,
+           "shipID": fits_table.c.shipID,
+           "_Fit__boosters": relation(
+               Booster,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True),
+           "_Fit__drones": relation(
+               Drone,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+           "_Fit__fighters": relation(
+               Fighter,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),
+           "_Fit__cargo": relation(
+               Cargo,
+               collection_class=HandledDroneCargoList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
+           "_Fit__projectedDrones": relation(
+               Drone,
+               collection_class=HandledProjectedDroneList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+           "_Fit__projectedFighters": relation(
+               Fighter,
+               collection_class=HandledProjectedDroneList,
+               cascade='all, delete, delete-orphan',
+               single_parent=True,
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),
+           "_Fit__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               backref='fit',
+               single_parent=True,
+               primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
+               secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
+               secondary=fitImplants_table),
+           "_Fit__character": relation(
+               Character,
+               backref="fits"),
+           "_Fit__damagePattern": relation(DamagePattern),
+           "_Fit__targetResists": relation(TargetResists),
+           "projectedOnto": relationship(
+               ProjectedFit,
+               primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+               backref='source_fit',
+               collection_class=attribute_mapped_collection('victimID'),
+               cascade='all, delete, delete-orphan'),
+           "victimOf": relationship(
+               ProjectedFit,
+               primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
+               backref='victim_fit',
+               collection_class=attribute_mapped_collection('sourceID'),
+               cascade='all, delete, delete-orphan'),
        }
-)
+       )
 
 mapper(ProjectedFit, projectedFits_table,
-       properties = {
-            "_ProjectedFit__amount": projectedFits_table.c.amount,
+       properties={
+           "_ProjectedFit__amount": projectedFits_table.c.amount,
        }
-)
+       )
diff --git a/eos/db/saveddata/fleet.py b/eos/db/saveddata/fleet.py
index 8f0e6736b..eb644b02e 100644
--- a/eos/db/saveddata/fleet.py
+++ b/eos/db/saveddata/fleet.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,52 +15,51 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
-from eos.types import Fleet, Wing, Squad, Fit
 from eos.db.saveddata.fit import fits_table
+from eos.types import Fleet, Wing, Squad, Fit
 
 gangs_table = Table("gangs", saveddata_meta,
-                    Column("ID", Integer, primary_key = True),
+                    Column("ID", Integer, primary_key=True),
                     Column("leaderID", ForeignKey("fits.ID")),
                     Column("boosterID", ForeignKey("fits.ID")),
                     Column("name", String))
 
 wings_table = Table("wings", saveddata_meta,
-                    Column("ID", Integer, primary_key = True),
+                    Column("ID", Integer, primary_key=True),
                     Column("gangID", ForeignKey("gangs.ID")),
                     Column("boosterID", ForeignKey("fits.ID")),
                     Column("leaderID", ForeignKey("fits.ID")))
 
 squads_table = Table("squads", saveddata_meta,
-                     Column("ID", Integer, primary_key = True),
+                     Column("ID", Integer, primary_key=True),
                      Column("wingID", ForeignKey("wings.ID")),
                      Column("leaderID", ForeignKey("fits.ID")),
                      Column("boosterID", ForeignKey("fits.ID")))
 
 squadmembers_table = Table("squadmembers", saveddata_meta,
-                           Column("squadID", ForeignKey("squads.ID"), primary_key = True),
-                           Column("memberID", ForeignKey("fits.ID"), primary_key = True))
+                           Column("squadID", ForeignKey("squads.ID"), primary_key=True),
+                           Column("memberID", ForeignKey("fits.ID"), primary_key=True))
 
 mapper(Fleet, gangs_table,
-       properties = {"wings" : relation(Wing, backref="gang"),
-                     "leader" : relation(Fit, primaryjoin = gangs_table.c.leaderID == fits_table.c.ID),
-                     "booster": relation(Fit, primaryjoin = gangs_table.c.boosterID == fits_table.c.ID)})
+       properties={"wings": relation(Wing, backref="gang"),
+                   "leader": relation(Fit, primaryjoin=gangs_table.c.leaderID == fits_table.c.ID),
+                   "booster": relation(Fit, primaryjoin=gangs_table.c.boosterID == fits_table.c.ID)})
 
 mapper(Wing, wings_table,
-       properties = {"squads" : relation(Squad, backref="wing"),
-                     "leader" : relation(Fit, primaryjoin = wings_table.c.leaderID == fits_table.c.ID),
-                     "booster": relation(Fit, primaryjoin = wings_table.c.boosterID == fits_table.c.ID)})
+       properties={"squads": relation(Squad, backref="wing"),
+                   "leader": relation(Fit, primaryjoin=wings_table.c.leaderID == fits_table.c.ID),
+                   "booster": relation(Fit, primaryjoin=wings_table.c.boosterID == fits_table.c.ID)})
 
 mapper(Squad, squads_table,
-       properties = {"leader" : relation(Fit, primaryjoin = squads_table.c.leaderID == fits_table.c.ID),
-                     "booster" : relation(Fit, primaryjoin = squads_table.c.boosterID == fits_table.c.ID),
-                     "members" : relation(Fit,
-                                          primaryjoin = squads_table.c.ID == squadmembers_table.c.squadID,
-                                          secondaryjoin = squadmembers_table.c.memberID == fits_table.c.ID,
-                                          secondary = squadmembers_table)})
-
+       properties={"leader": relation(Fit, primaryjoin=squads_table.c.leaderID == fits_table.c.ID),
+                   "booster": relation(Fit, primaryjoin=squads_table.c.boosterID == fits_table.c.ID),
+                   "members": relation(Fit,
+                                       primaryjoin=squads_table.c.ID == squadmembers_table.c.squadID,
+                                       secondaryjoin=squadmembers_table.c.memberID == fits_table.c.ID,
+                                       secondary=squadmembers_table)})
diff --git a/eos/db/saveddata/implant.py b/eos/db/saveddata/implant.py
index c74def157..21145698f 100644
--- a/eos/db/saveddata/implant.py
+++ b/eos/db/saveddata/implant.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
@@ -24,20 +24,20 @@ from eos.db import saveddata_meta
 from eos.types import Implant
 
 implants_table = Table("implants", saveddata_meta,
-                     Column("ID", Integer, primary_key = True),
-                     Column("itemID", Integer),
-                     Column("active", Boolean))
+                       Column("ID", Integer, primary_key=True),
+                       Column("itemID", Integer),
+                       Column("active", Boolean))
 
 fitImplants_table = Table("fitImplants", saveddata_meta,
-                          Column("fitID", ForeignKey("fits.ID"), index = True),
-                          Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                          Column("fitID", ForeignKey("fits.ID"), index=True),
+                          Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 charImplants_table = Table("charImplants", saveddata_meta,
-                           Column("charID", ForeignKey("characters.ID"), index = True),
-                           Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                           Column("charID", ForeignKey("characters.ID"), index=True),
+                           Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 implantsSetMap_table = Table("implantSetMap", saveddata_meta,
-                             Column("setID", ForeignKey("implantSets.ID"), index = True),
-                             Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+                             Column("setID", ForeignKey("implantSets.ID"), index=True),
+                             Column("implantID", ForeignKey("implants.ID"), primary_key=True))
 
 mapper(Implant, implants_table)
diff --git a/eos/db/saveddata/implantSet.py b/eos/db/saveddata/implantSet.py
index 73036de91..042e986f6 100644
--- a/eos/db/saveddata/implantSet.py
+++ b/eos/db/saveddata/implantSet.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2016 Ryan Holmes
 #
 # This file is part of eos.
@@ -15,31 +15,31 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
+from sqlalchemy import Table, Column, Integer, String
 from sqlalchemy.orm import relation, mapper
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import implantsSetMap_table
-from eos.types import Implant, ImplantSet
 from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.types import Implant, ImplantSet
 
 implant_set_table = Table("implantSets", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False),
-)
+                          Column("ID", Integer, primary_key=True),
+                          Column("name", String, nullable=False),
+                          )
 
 mapper(ImplantSet, implant_set_table,
-        properties = {
-            "_ImplantSet__implants": relation(
-                Implant,
-                collection_class = HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                backref='set',
-                single_parent=True,
-                primaryjoin = implantsSetMap_table.c.setID == implant_set_table.c.ID,
-                secondaryjoin = implantsSetMap_table.c.implantID == Implant.ID,
-                secondary = implantsSetMap_table),
-        }
-)
+       properties={
+           "_ImplantSet__implants": relation(
+               Implant,
+               collection_class=HandledImplantBoosterList,
+               cascade='all, delete, delete-orphan',
+               backref='set',
+               single_parent=True,
+               primaryjoin=implantsSetMap_table.c.setID == implant_set_table.c.ID,
+               secondaryjoin=implantsSetMap_table.c.implantID == Implant.ID,
+               secondary=implantsSetMap_table),
+       }
+       )
diff --git a/eos/db/saveddata/loadDefaultDatabaseValues.py b/eos/db/saveddata/loadDefaultDatabaseValues.py
index eff116933..3dcccca68 100644
--- a/eos/db/saveddata/loadDefaultDatabaseValues.py
+++ b/eos/db/saveddata/loadDefaultDatabaseValues.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of pyfa.
@@ -15,14 +15,16 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import eos.db
 import eos.types
 
+
 class ImportError(Exception):
     pass
 
+
 class DefaultDatabaseValues():
     def __init__(self):
         pass
diff --git a/eos/db/saveddata/miscData.py b/eos/db/saveddata/miscData.py
index 44d586d73..ac4c85b2d 100644
--- a/eos/db/saveddata/miscData.py
+++ b/eos/db/saveddata/miscData.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2011 Anton Vorobyov
 #
 # This file is part of eos.
@@ -15,15 +15,16 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
-from eos.types import MiscData
+
 from eos.db import saveddata_meta
+from eos.types import MiscData
 
 miscdata_table = Table("miscdata", saveddata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                       Column("fieldName", String, primary_key=True),
+                       Column("fieldValue", String))
 
 mapper(MiscData, miscdata_table)
diff --git a/eos/db/saveddata/module.py b/eos/db/saveddata/module.py
index a89f7b636..d6c2b068c 100644
--- a/eos/db/saveddata/module.py
+++ b/eos/db/saveddata/module.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean
 from sqlalchemy.orm import relation, mapper
@@ -24,16 +24,15 @@ from eos.db import saveddata_meta
 from eos.types import Module, Fit
 
 modules_table = Table("modules", saveddata_meta,
-                      Column("ID", Integer, primary_key = True),
-                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                      Column("itemID", Integer, nullable = True),
-                      Column("dummySlot", Integer, nullable = True, default = None),
+                      Column("ID", Integer, primary_key=True),
+                      Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
+                      Column("itemID", Integer, nullable=True),
+                      Column("dummySlot", Integer, nullable=True, default=None),
                       Column("chargeID", Integer),
                       Column("state", Integer, CheckConstraint("state >= -1"), CheckConstraint("state <= 2")),
-                      Column("projected", Boolean, default = False, nullable = False),
+                      Column("projected", Boolean, default=False, nullable=False),
                       Column("position", Integer),
                       CheckConstraint('("dummySlot" = NULL OR "itemID" = NULL) AND "dummySlot" != "itemID"'))
 
 mapper(Module, modules_table,
-       properties = {"owner" : relation(Fit)})
-
+       properties={"owner": relation(Fit)})
diff --git a/eos/db/saveddata/override.py b/eos/db/saveddata/override.py
index 8245463e3..e260cd3df 100644
--- a/eos/db/saveddata/override.py
+++ b/eos/db/saveddata/override.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, Float
 from sqlalchemy.orm import mapper
@@ -24,8 +24,8 @@ from eos.db import saveddata_meta
 from eos.types import Override
 
 overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True, index = True),
-                     Column("attrID", Integer, primary_key=True, index = True),
-                     Column("value", Float, nullable = False))
+                        Column("itemID", Integer, primary_key=True, index=True),
+                        Column("attrID", Integer, primary_key=True, index=True),
+                        Column("value", Float, nullable=False))
 
 mapper(Override, overrides_table)
diff --git a/eos/db/saveddata/price.py b/eos/db/saveddata/price.py
index 172dfba49..021d341e8 100644
--- a/eos/db/saveddata/price.py
+++ b/eos/db/saveddata/price.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +15,18 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Float, Integer
 from sqlalchemy.orm import mapper
+
 from eos.db import saveddata_meta
 from eos.types import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
                      Column("price", Float),
-                     Column("time", Integer, nullable = False),
+                     Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
 mapper(Price, prices_table)
diff --git a/eos/db/saveddata/queries.py b/eos/db/saveddata/queries.py
index 5a6dd1bfc..09bd24720 100644
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,27 +15,32 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
-from eos.db.util import processEager, processWhere
-from eos.db import saveddata_session, sd_lock
-
-from eos.types import *
-from eos.db.saveddata.fleet import squadmembers_table
-from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
+
 import eos.config
+from eos.db import saveddata_session, sd_lock
+from eos.db.saveddata.fit import projectedFits_table
+from eos.db.saveddata.fleet import squadmembers_table
+from eos.db.util import processEager, processWhere
+from eos.types import *
 
 configVal = getattr(eos.config, "saveddataCache", None)
 if configVal is True:
     import weakref
+
     itemCache = {}
     queryCache = {}
+
+
     def cachedQuery(type, amount, *keywords):
         itemCache[type] = localItemCache = weakref.WeakValueDictionary()
         queryCache[type] = typeQueryCache = {}
+
         def deco(function):
             localQueryCache = typeQueryCache[function] = {}
+
             def setCache(cacheKey, args, kwargs):
                 items = function(*args, **kwargs)
                 IDs = set()
@@ -44,7 +49,7 @@ if configVal is True:
                 for item in stuff:
                     ID = getattr(item, "ID", None)
                     if ID is None:
-                        #Some uncachable data, don't cache this query
+                        # Some uncachable data, don't cache this query
                         del localQueryCache[cacheKey]
                         break
                     localItemCache[ID] = item
@@ -70,7 +75,7 @@ if configVal is True:
                         for ID in IDs:
                             data = localItemCache.get(ID)
                             if data is None:
-                                #Fuck, some of our stuff isn't cached it seems.
+                                # Fuck, some of our stuff isn't cached it seems.
                                 items = setCache(cacheKey, args, kwargs)
                                 break
                             items.append(data)
@@ -82,9 +87,12 @@ if configVal is True:
                             break
 
                 return items
+
             return checkAndReturn
+
         return deco
 
+
     def removeCachedEntry(type, ID):
         if not type in queryCache:
             return
@@ -111,11 +119,14 @@ else:
                 return function(*args, **kwargs)
 
             return checkAndReturn
+
         return deco
 
+
     def removeCachedEntry(*args, **kwargs):
         return
 
+
 def sqlizeString(line):
     # Escape backslashes first, as they will be as escape symbol in queries
     # Then escape percent and underscore signs
@@ -123,6 +134,7 @@ def sqlizeString(line):
     line = line.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_").replace("*", "%")
     return line
 
+
 @cachedQuery(User, 1, "lookfor")
 def getUser(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -141,6 +153,7 @@ def getUser(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return user
 
+
 @cachedQuery(Character, 1, "lookfor")
 def getCharacter(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -154,17 +167,20 @@ def getCharacter(lookfor, eager=None):
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            character = saveddata_session.query(Character).options(*eager).filter(Character.savedName == lookfor).first()
+            character = saveddata_session.query(Character).options(*eager).filter(
+                Character.savedName == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return character
 
+
 def getCharacterList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         characters = saveddata_session.query(Character).options(*eager).all()
     return characters
 
+
 def getCharactersForUser(lookfor, eager=None):
     if isinstance(lookfor, int):
         eager = processEager(eager)
@@ -174,6 +190,7 @@ def getCharactersForUser(lookfor, eager=None):
         raise TypeError("Need integer as argument")
     return characters
 
+
 @cachedQuery(Fit, 1, "lookfor")
 def getFit(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -194,6 +211,7 @@ def getFit(lookfor, eager=None):
 
     return fit
 
+
 @cachedQuery(Fleet, 1, "fleetID")
 def getFleet(fleetID, eager=None):
     if isinstance(fleetID, int):
@@ -208,6 +226,7 @@ def getFleet(fleetID, eager=None):
         raise TypeError("Need integer as argument")
     return fleet
 
+
 @cachedQuery(Wing, 1, "wingID")
 def getWing(wingID, eager=None):
     if isinstance(wingID, int):
@@ -222,6 +241,7 @@ def getWing(wingID, eager=None):
         raise TypeError("Need integer as argument")
     return wing
 
+
 @cachedQuery(Squad, 1, "squadID")
 def getSquad(squadID, eager=None):
     if isinstance(squadID, int):
@@ -236,6 +256,7 @@ def getSquad(squadID, eager=None):
         raise TypeError("Need integer as argument")
     return squad
 
+
 def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -257,6 +278,7 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 
     return fits
 
+
 def getBoosterFits(ownerID=None, where=None, eager=None):
     """
     Get all the fits that are flagged as a boosting ship
@@ -276,11 +298,13 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
 
     return fits
 
+
 def countAllFits():
     with sd_lock:
         count = saveddata_session.query(Fit).count()
     return count
 
+
 def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -301,6 +325,7 @@ def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         raise TypeError("ShipID must be integer")
     return count
 
+
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
@@ -308,12 +333,14 @@ def getFitList(eager=None):
 
     return fits
 
+
 def getFleetList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         fleets = saveddata_session.query(Fleet).options(*eager).all()
     return fleets
 
+
 @cachedQuery(Price, 1, "typeID")
 def getPrice(typeID):
     if isinstance(typeID, int):
@@ -323,12 +350,14 @@ def getPrice(typeID):
         raise TypeError("Need integer as argument")
     return price
 
+
 def clearPrices():
     with sd_lock:
         deleted_rows = saveddata_session.query(Price).delete()
     commit()
     return deleted_rows
 
+
 def getMiscData(field):
     if isinstance(field, basestring):
         with sd_lock:
@@ -337,24 +366,28 @@ def getMiscData(field):
         raise TypeError("Need string as argument")
     return data
 
+
 def getDamagePatternList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         patterns = saveddata_session.query(DamagePattern).options(*eager).all()
     return patterns
 
+
 def getTargetResistsList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         patterns = saveddata_session.query(TargetResists).options(*eager).all()
     return patterns
 
+
 def getImplantSetList(eager=None):
     eager = processEager(eager)
     with sd_lock:
         sets = saveddata_session.query(ImplantSet).options(*eager).all()
     return sets
 
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -364,15 +397,18 @@ def getDamagePattern(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                pattern = saveddata_session.query(DamagePattern).options(*eager).filter(DamagePattern.ID == lookfor).first()
+                pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
+                    DamagePattern.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            pattern = saveddata_session.query(DamagePattern).options(*eager).filter(DamagePattern.name == lookfor).first()
+            pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
+                DamagePattern.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return pattern
 
+
 @cachedQuery(TargetResists, 1, "lookfor")
 def getTargetResists(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -382,15 +418,18 @@ def getTargetResists(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.ID == lookfor).first()
+                pattern = saveddata_session.query(TargetResists).options(*eager).filter(
+                    TargetResists.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.name == lookfor).first()
+            pattern = saveddata_session.query(TargetResists).options(*eager).filter(
+                TargetResists.name == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return pattern
 
+
 @cachedQuery(ImplantSet, 1, "lookfor")
 def getImplantSet(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -400,7 +439,8 @@ def getImplantSet(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.ID == lookfor).first()
+                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(
+                    TargetResists.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
@@ -409,13 +449,14 @@ def getImplantSet(lookfor, eager=None):
         raise TypeError("Improper argument")
     return pattern
 
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
     # Prepare our string for request
     nameLike = u"%{0}%".format(sqlizeString(nameLike))
 
-    #Add any extra components to the search to our where clause
+    # Add any extra components to the search to our where clause
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
@@ -423,15 +464,18 @@ def searchFits(nameLike, where=None, eager=None):
 
     return fits
 
+
 def getSquadsIDsWithFitID(fitID):
     if isinstance(fitID, int):
         with sd_lock:
-            squads = saveddata_session.query(squadmembers_table.c.squadID).filter(squadmembers_table.c.memberID == fitID).all()
+            squads = saveddata_session.query(squadmembers_table.c.squadID).filter(
+                squadmembers_table.c.memberID == fitID).all()
             squads = tuple(entry[0] for entry in squads)
             return squads
     else:
         raise TypeError("Need integer as argument")
 
+
 def getProjectedFits(fitID):
     if isinstance(fitID, int):
         with sd_lock:
@@ -441,12 +485,14 @@ def getProjectedFits(fitID):
     else:
         raise TypeError("Need integer as argument")
 
+
 def getCrestCharacters(eager=None):
     eager = processEager(eager)
     with sd_lock:
         characters = saveddata_session.query(CrestChar).options(*eager).all()
     return characters
 
+
 @cachedQuery(CrestChar, 1, "lookfor")
 def getCrestCharacter(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -465,21 +511,25 @@ def getCrestCharacter(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return character
 
+
 def getOverrides(itemID, eager=None):
     if isinstance(itemID, int):
         return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
     else:
         raise TypeError("Need integer as argument")
 
+
 def clearOverrides():
     with sd_lock:
         deleted_rows = saveddata_session.query(Override).delete()
     commit()
     return deleted_rows
 
+
 def getAllOverrides(eager=None):
     return saveddata_session.query(Override).all()
 
+
 def removeInvalid(fits):
     invalids = [f for f in fits if f.isInvalid]
 
@@ -490,14 +540,17 @@ def removeInvalid(fits):
 
     return fits
 
+
 def add(stuff):
     with sd_lock:
         saveddata_session.add(stuff)
 
+
 def save(stuff):
     add(stuff)
     commit()
 
+
 def remove(stuff):
     removeCachedEntry(type(stuff), stuff.ID)
     with sd_lock:
diff --git a/eos/db/saveddata/skill.py b/eos/db/saveddata/skill.py
index 38bd1ea9a..1c488a2cd 100644
--- a/eos/db/saveddata/skill.py
+++ b/eos/db/saveddata/skill.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
@@ -24,8 +24,8 @@ from eos.db import saveddata_meta
 from eos.types import Skill
 
 skills_table = Table("characterSkills", saveddata_meta,
-                     Column("characterID", ForeignKey("characters.ID"), primary_key = True, index = True),
-                     Column("itemID", Integer, primary_key = True),
-                     Column("_Skill__level", Integer, nullable = True))
+                     Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),
+                     Column("itemID", Integer, primary_key=True),
+                     Column("_Skill__level", Integer, nullable=True))
 
 mapper(Skill, skills_table)
diff --git a/eos/db/saveddata/targetResists.py b/eos/db/saveddata/targetResists.py
index f7106fe45..88c1ca104 100644
--- a/eos/db/saveddata/targetResists.py
+++ b/eos/db/saveddata/targetResists.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2014 Ryan Holmes
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
 from sqlalchemy.orm import mapper
@@ -24,12 +24,12 @@ from eos.db import saveddata_meta
 from eos.types import TargetResists
 
 targetResists_table = Table("targetResists", saveddata_meta,
-                             Column("ID", Integer, primary_key = True),
-                             Column("name", String),
-                             Column("emAmount", Float),
-                             Column("thermalAmount", Float),
-                             Column("kineticAmount", Float),
-                             Column("explosiveAmount", Float),
-                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+                            Column("ID", Integer, primary_key=True),
+                            Column("name", String),
+                            Column("emAmount", Float),
+                            Column("thermalAmount", Float),
+                            Column("kineticAmount", Float),
+                            Column("explosiveAmount", Float),
+                            Column("ownerID", ForeignKey("users.ID"), nullable=True))
 
 mapper(TargetResists, targetResists_table)
diff --git a/eos/db/saveddata/user.py b/eos/db/saveddata/user.py
index f2a914691..f7ec10629 100644
--- a/eos/db/saveddata/user.py
+++ b/eos/db/saveddata/user.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 from sqlalchemy import Table, Column, Integer, String, Boolean
 from sqlalchemy.orm import mapper
@@ -24,9 +24,9 @@ from eos.db import saveddata_meta
 from eos.types import User
 
 users_table = Table("users", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("username", String, nullable = False, unique = True),
-                         Column("password", String, nullable = False),
-                         Column("admin", Boolean, nullable = False))
+                    Column("ID", Integer, primary_key=True),
+                    Column("username", String, nullable=False, unique=True),
+                    Column("password", String, nullable=False),
+                    Column("admin", Boolean, nullable=False))
 
 mapper(User, users_table)