diff --git a/eos/__init__.py b/eos/__init__.py
index 208d2b1df3..f6e146b5f5 100644
--- a/eos/__init__.py
+++ b/eos/__init__.py
@@ -1,6 +1,7 @@
 version = "0.2.3"
 tag = "git"
 
+
 def test():
     import tests.runTests
     import unittest
diff --git a/eos/capSim.py b/eos/capSim.py
index a5ed4a8d14..d57567ae63 100644
--- a/eos/capSim.py
+++ b/eos/capSim.py
@@ -1,12 +1,12 @@
 import heapq
-from math import sqrt, exp
 import time
-
+from math import sqrt, exp
 
 DAY = 24 * 60 * 60 * 1000
 
-def lcm(a,b):
-    n = a*b
+
+def lcm(a, b):
+    n = a * b
     while b:
         a, b = b, a % b
     return n / a
@@ -40,20 +40,19 @@ def __init__(self):
         # relevant decimal digits of capacitor for LCM period optimization
         self.stability_precision = 1
 
-
     def scale_activation(self, duration, capNeed):
         for res in self.scale_resolutions:
             mod = duration % res
             if mod:
-                if mod > res/2.0:
-                    mod = res-mod
+                if mod > res / 2.0:
+                    mod = res - mod
                 else:
                     mod = -mod
 
-                if abs(mod) <= duration/100.0:
+                if abs(mod) <= duration / 100.0:
                     # only adjust if the adjustment is less than 1%
                     duration += mod
-                    capNeed += float(mod)/duration * capNeed
+                    capNeed += float(mod) / duration * capNeed
                     break
 
         return duration, capNeed
@@ -91,12 +90,12 @@ def reset(self):
         for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
             if self.stagger and not disableStagger:
                 if clipSize == 0:
-                    duration = int(duration/amount)
+                    duration = int(duration / amount)
                 else:
-                    stagger_amount = (duration*clipSize+10000)/(amount*clipSize)
+                    stagger_amount = (duration * clipSize + 10000) / (amount * clipSize)
                     for i in range(1, amount):
                         heapq.heappush(self.state,
-                                       [i*stagger_amount, duration,
+                                       [i * stagger_amount, duration,
                                         capNeed, 0, clipSize])
             else:
                 capNeed *= amount
@@ -109,13 +108,11 @@ def reset(self):
 
             heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize])
 
-
         if disable_period:
             self.period = self.t_max
         else:
             self.period = period
 
-
     def run(self):
         """Run the simulation"""
 
@@ -135,13 +132,13 @@ def run(self):
         capCapacity = self.capacitorCapacity
         tau = self.capacitorRecharge / 5.0
 
-        cap_wrap = capCapacity                # cap value at last period
-        cap_lowest = capCapacity            # lowest cap value encountered
-        cap_lowest_pre = capCapacity    # lowest cap value before activations
-        cap = capCapacity                         # current cap value
-        t_wrap = self.period                    # point in time of next period
+        cap_wrap = capCapacity  # cap value at last period
+        cap_lowest = capCapacity  # lowest cap value encountered
+        cap_lowest_pre = capCapacity  # lowest cap value before activations
+        cap = capCapacity  # current cap value
+        t_wrap = self.period  # point in time of next period
 
-        t_now = t_last = 0
+        t_last = 0
         t_max = self.t_max
 
         while 1:
@@ -150,7 +147,7 @@ def run(self):
             if t_now >= t_max:
                 break
 
-            cap = ((1.0+(sqrt(cap/capCapacity)-1.0)*exp((t_last-t_now)/tau))**2)*capCapacity
+            cap = ((1.0 + (sqrt(cap / capCapacity) - 1.0) * exp((t_last - t_now) / tau)) ** 2) * capCapacity
 
             if t_now != t_last:
                 if cap < cap_lowest_pre:
@@ -182,7 +179,7 @@ def run(self):
             if clipSize:
                 if shot % clipSize == 0:
                     shot = 0
-                    t_now += 10000    # include reload time
+                    t_now += 10000  # include reload time
             activation[0] = t_now
             activation[3] = shot
 
@@ -195,19 +192,17 @@ def run(self):
 
         # calculate EVE's stability value
         try:
-            avgDrain = reduce(float.__add__, map(lambda x: x[2]/x[1], self.state), 0.0)
-            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity)/capCapacity)) ** 2
+            avgDrain = reduce(float.__add__, map(lambda x: x[2] / x[1], self.state), 0.0)
+            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2
         except ValueError:
             self.cap_stable_eve = 0.0
 
-
         if cap > 0.0:
             # capacitor low/high water marks
             self.cap_stable_low = cap_lowest
             self.cap_stable_high = cap_lowest_pre
         else:
-            self.cap_stable_low =\
-            self.cap_stable_high = 0.0
-
+            self.cap_stable_low = \
+                self.cap_stable_high = 0.0
 
-        self.runtime = time.time()-start
+        self.runtime = time.time() - start
diff --git a/eos/config.py b/eos/config.py
index 6e30afb031..63bf7695bc 100644
--- a/eos/config.py
+++ b/eos/config.py
@@ -1,11 +1,13 @@
-from os.path import realpath, join, dirname, abspath
 import sys
+from os.path import realpath, join, dirname, abspath
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
-saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")),
+                                                   sys.getfilesystemencoding())
+saveddata_connectionstring = 'sqlite:///' + unicode(
+    realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
-#Autodetect path, only change if the autodetection bugs out.
+# Autodetect path, only change if the autodetection bugs out.
 path = dirname(unicode(__file__, sys.getfilesystemencoding()))
diff --git a/eos/db/__init__.py b/eos/db/__init__.py
index 7aef55fd7b..e0dd4d1354 100644
--- a/eos/db/__init__.py
+++ b/eos/db/__init__.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/>.
-#===============================================================================
+# ===============================================================================
 
 import threading
 
@@ -24,17 +24,20 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import pool
 
-from eos import config
+
 import migration
+from eos import config
+
 
 class ReadOnlyException(Exception):
     pass
 
+
 gamedata_connectionstring = config.gamedata_connectionstring
 if callable(gamedata_connectionstring):
-    gamedata_engine = create_engine("sqlite://", creator=gamedata_connectionstring, echo = config.debug)
+    gamedata_engine = create_engine("sqlite://", creator=gamedata_connectionstring, echo=config.debug)
 else:
-    gamedata_engine = create_engine(gamedata_connectionstring, echo = config.debug)
+    gamedata_engine = create_engine(gamedata_connectionstring, echo=config.debug)
 
 gamedata_meta = MetaData()
 gamedata_meta.bind = gamedata_engine
@@ -44,8 +47,8 @@ class ReadOnlyException(Exception):
 # game db because we haven't reached gamedata_meta.create_all()
 try:
     config.gamedata_version = gamedata_session.execute(
-            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
-        ).fetchone()[0]
+        "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+    ).fetchone()[0]
 except:
     config.gamedata_version = None
 
@@ -63,19 +66,19 @@ class ReadOnlyException(Exception):
 # Lock controlling any changes introduced to session
 sd_lock = threading.Lock()
 
-#Import all the definitions for all our database stuff
+# Import all the definitions for all our database stuff
 from eos.db.gamedata import *
 from eos.db.saveddata import *
 
-#Import queries
+# Import queries
 from eos.db.gamedata.queries import *
 from eos.db.saveddata.queries import *
 
-#If using in memory saveddata, you'll want to reflect it so the data structure is good.
+# If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
     saveddata_meta.create_all()
 
+
 def rollback():
     with sd_lock:
         saveddata_session.rollback()
-
diff --git a/eos/db/gamedata/attribute.py b/eos/db/gamedata/attribute.py
index 3f880c026e..e09e0865be 100644
--- a/eos/db/gamedata/attribute.py
+++ b/eos/db/gamedata/attribute.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,20 +15,22 @@
 #
 # 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, Unicode, ForeignKey, String, Boolean
-from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.ext.associationproxy import association_proxy
-from eos.types import Attribute, Icon, AttributeInfo, Unit
+from sqlalchemy.orm import relation, mapper, synonym, deferred
+
 from eos.db import gamedata_meta
+from eos.types import Attribute, Icon, AttributeInfo, Unit
+
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
-                         Column("value", Float),
-                         Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
-                         Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
+                             Column("value", Float),
+                             Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                             Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True))
 
 attributes_table = Table("dgmattribs", gamedata_meta,
-                         Column("attributeID", Integer, primary_key = True),
+                         Column("attributeID", Integer, primary_key=True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
                          Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
@@ -40,14 +42,14 @@
                          Column("unitID", Integer, ForeignKey("dgmunits.unitID")))
 
 mapper(Attribute, typeattributes_table,
-       properties = {"info": relation(AttributeInfo, lazy=False)})
+       properties={"info": relation(AttributeInfo, lazy=False)})
 
 mapper(AttributeInfo, attributes_table,
-       properties = {"icon" : relation(Icon),
-                     "unit": relation(Unit),
-                     "ID": synonym("attributeID"),
-                     "name": synonym("attributeName"),
-                     "description" : deferred(attributes_table.c.description)})
+       properties={"icon": relation(Icon),
+                   "unit": relation(Unit),
+                   "ID": synonym("attributeID"),
+                   "name": synonym("attributeName"),
+                   "description": deferred(attributes_table.c.description)})
 
 Attribute.ID = association_proxy("info", "attributeID")
 Attribute.name = association_proxy("info", "attributeName")
diff --git a/eos/db/gamedata/category.py b/eos/db/gamedata/category.py
index a44b7d6634..d33cce1306 100644
--- a/eos/db/gamedata/category.py
+++ b/eos/db/gamedata/category.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 Column, String, Integer, ForeignKey, Boolean, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,14 +24,14 @@
 from eos.types import Category, Icon
 
 categories_table = Table("invcategories", gamedata_meta,
-                         Column("categoryID", Integer, primary_key = True),
+                         Column("categoryID", Integer, primary_key=True),
                          Column("categoryName", String),
                          Column("description", String),
                          Column("published", Boolean),
                          Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(Category, categories_table,
-       properties = {"icon" : relation(Icon),
-                     "ID" : synonym("categoryID"),
-                     "name" : synonym("categoryName"),
-                     "description" : deferred(categories_table.c.description)})
+       properties={"icon": relation(Icon),
+                   "ID": synonym("categoryID"),
+                   "name": synonym("categoryName"),
+                   "description": deferred(categories_table.c.description)})
diff --git a/eos/db/gamedata/effect.py b/eos/db/gamedata/effect.py
index 21d7613c63..001d051626 100644
--- a/eos/db/gamedata/effect.py
+++ b/eos/db/gamedata/effect.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,35 +15,35 @@
 #
 # 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, String, Integer, Boolean, Table, ForeignKey
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, synonym, relation, deferred
-from eos.types import Effect, EffectInfo
+
 from eos.db import gamedata_meta
+from eos.types import Effect, EffectInfo
 
 typeeffects_table = Table("dgmtypeeffects", gamedata_meta,
                           Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
                           Column("effectID", Integer, ForeignKey("dgmeffects.effectID"), primary_key=True))
 
 effects_table = Table("dgmeffects", gamedata_meta,
-                      Column("effectID", Integer, primary_key = True),
+                      Column("effectID", Integer, primary_key=True),
                       Column("effectName", String),
                       Column("description", String),
                       Column("published", Boolean),
                       Column("isAssistance", Boolean),
                       Column("isOffensive", Boolean))
 
-
 mapper(EffectInfo, effects_table,
-       properties = {"ID" : synonym("effectID"),
-                     "name" : synonym("effectName"),
-                     "description" : deferred(effects_table.c.description)})
+       properties={"ID": synonym("effectID"),
+                   "name": synonym("effectName"),
+                   "description": deferred(effects_table.c.description)})
 
 mapper(Effect, typeeffects_table,
-       properties = {"ID": synonym("effectID"),
-                     "info": relation(EffectInfo, lazy=False)})
+       properties={"ID": synonym("effectID"),
+                   "info": relation(EffectInfo, lazy=False)})
 
 Effect.name = association_proxy("info", "name")
 Effect.description = association_proxy("info", "description")
diff --git a/eos/db/gamedata/group.py b/eos/db/gamedata/group.py
index 14939c0409..cbf0a34d84 100644
--- a/eos/db/gamedata/group.py
+++ b/eos/db/gamedata/group.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 Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,7 +24,7 @@
 from eos.types import Group, Icon, Category
 
 groups_table = Table("invgroups", gamedata_meta,
-                     Column("groupID", Integer, primary_key = True),
+                     Column("groupID", Integer, primary_key=True),
                      Column("groupName", String),
                      Column("description", String),
                      Column("published", Boolean),
@@ -32,8 +32,8 @@
                      Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(Group, groups_table,
-       properties = {"category" : relation(Category, backref = "groups"),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("groupID"),
-                     "name" : synonym("groupName"),
-                     "description" : deferred(groups_table.c.description)})
+       properties={"category": relation(Category, backref="groups"),
+                   "icon": relation(Icon),
+                   "ID": synonym("groupID"),
+                   "name": synonym("groupName"),
+                   "description": deferred(groups_table.c.description)})
diff --git a/eos/db/gamedata/icon.py b/eos/db/gamedata/icon.py
index 9aeecdf87d..d0315b28f6 100644
--- a/eos/db/gamedata/icon.py
+++ b/eos/db/gamedata/icon.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 Column, String, Integer, Table
 from sqlalchemy.orm import mapper, synonym, deferred
@@ -24,10 +24,10 @@
 from eos.types import Icon
 
 icons_table = Table("icons", gamedata_meta,
-                    Column("iconID", Integer, primary_key = True),
+                    Column("iconID", Integer, primary_key=True),
                     Column("description", String),
                     Column("iconFile", String))
 
 mapper(Icon, icons_table,
-       properties = {"ID" : synonym("iconID"),
-                     "description" : deferred(icons_table.c.description)})
+       properties={"ID": synonym("iconID"),
+                   "description": deferred(icons_table.c.description)})
diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py
index 34a1a6189a..a23c3a7869 100644
--- a/eos/db/gamedata/item.py
+++ b/eos/db/gamedata/item.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 Column, String, Integer, Boolean, ForeignKey, Table, Float
-from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
 from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
 
 items_table = Table("invtypes", gamedata_meta,
-                    Column("typeID", Integer, primary_key = True),
+                    Column("typeID", Integer, primary_key=True),
                     Column("typeName", String, index=True),
                     Column("description", String),
                     Column("raceID", Integer),
@@ -43,19 +43,19 @@
 from .traits import traits_table
 
 mapper(Item, items_table,
-       properties = {"group" : relation(Group, backref = "items"),
-                     "icon" : relation(Icon),
-                     "_Item__attributes" : relation(Attribute, collection_class = attribute_mapped_collection('name')),
-                     "effects" : relation(Effect, collection_class = attribute_mapped_collection('name')),
-                     "metaGroup" : relation(MetaType,
-                                            primaryjoin = metatypes_table.c.typeID == items_table.c.typeID,
-                                            uselist = False),
-                     "ID" : synonym("typeID"),
-                     "name" : synonym("typeName"),
-                     "description" : deferred(items_table.c.description),
-                     "traits" : relation(Traits,
-                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
-                                         uselist = False)
-                    })
+       properties={"group": relation(Group, backref="items"),
+                   "icon": relation(Icon),
+                   "_Item__attributes": relation(Attribute, collection_class=attribute_mapped_collection('name')),
+                   "effects": relation(Effect, collection_class=attribute_mapped_collection('name')),
+                   "metaGroup": relation(MetaType,
+                                         primaryjoin=metatypes_table.c.typeID == items_table.c.typeID,
+                                         uselist=False),
+                   "ID": synonym("typeID"),
+                   "name": synonym("typeName"),
+                   "description": deferred(items_table.c.description),
+                   "traits": relation(Traits,
+                                      primaryjoin=traits_table.c.typeID == items_table.c.typeID,
+                                      uselist=False)
+                   })
 
 Item.category = association_proxy("group", "category")
diff --git a/eos/db/gamedata/marketGroup.py b/eos/db/gamedata/marketGroup.py
index 6f16e48aec..b5b631ea31 100644
--- a/eos/db/gamedata/marketGroup.py
+++ b/eos/db/gamedata/marketGroup.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 Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
@@ -24,17 +24,19 @@
 from eos.types import Item, MarketGroup, Icon
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
-                           Column("marketGroupID", Integer, primary_key = True),
+                           Column("marketGroupID", Integer, primary_key=True),
                            Column("marketGroupName", String),
                            Column("description", String),
                            Column("hasTypes", Boolean),
-                           Column("parentGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
+                           Column("parentGroupID", Integer,
+                                  ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
                            Column("iconID", Integer, ForeignKey("icons.iconID")))
 
 mapper(MarketGroup, marketgroups_table,
-       properties = {"items" : relation(Item, backref = "marketGroup"),
-                     "parent" : relation(MarketGroup, backref = "children", remote_side = [marketgroups_table.c.marketGroupID]),
-                     "icon" : relation(Icon),
-                     "ID" : synonym("marketGroupID"),
-                     "name" : synonym("marketGroupName"),
-                     "description" : deferred(marketgroups_table.c.description)})
+       properties={"items": relation(Item, backref="marketGroup"),
+                   "parent": relation(MarketGroup, backref="children",
+                                      remote_side=[marketgroups_table.c.marketGroupID]),
+                   "icon": relation(Icon),
+                   "ID": synonym("marketGroupID"),
+                   "name": synonym("marketGroupName"),
+                   "description": deferred(marketgroups_table.c.description)})
diff --git a/eos/db/gamedata/metaData.py b/eos/db/gamedata/metaData.py
index bdbdd7c8a3..6bf500a728 100644
--- a/eos/db/gamedata/metaData.py
+++ b/eos/db/gamedata/metaData.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # 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 MetaData
+
 from eos.db import gamedata_meta
+from eos.types import MetaData
 
 metadata_table = Table("metadata", gamedata_meta,
-                           Column("field_name", String, primary_key=True),
-                           Column("field_value", String))
+                       Column("field_name", String, primary_key=True),
+                       Column("field_value", String))
 
 mapper(MetaData, metadata_table)
diff --git a/eos/db/gamedata/metaGroup.py b/eos/db/gamedata/metaGroup.py
index 554bf5739a..e5ed5c3998 100644
--- a/eos/db/gamedata/metaGroup.py
+++ b/eos/db/gamedata/metaGroup.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,33 +15,33 @@
 #
 # 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.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym
+
 from eos.db import gamedata_meta
 from eos.db.gamedata.item import items_table
 from eos.types import MetaGroup, Item, MetaType
-from sqlalchemy.ext.associationproxy import association_proxy
 
 metagroups_table = Table("invmetagroups", gamedata_meta,
-                         Column("metaGroupID", Integer, primary_key = True),
+                         Column("metaGroupID", Integer, primary_key=True),
                          Column("metaGroupName", String))
 
 metatypes_table = Table("invmetatypes", gamedata_meta,
-                        Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key = True),
+                        Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
                         Column("parentTypeID", Integer, ForeignKey("invtypes.typeID")),
                         Column("metaGroupID", Integer, ForeignKey("invmetagroups.metaGroupID")))
 
 mapper(MetaGroup, metagroups_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "name" : synonym("metaGroupName")})
+       properties={"ID": synonym("metaGroupID"),
+                   "name": synonym("metaGroupName")})
 
 mapper(MetaType, metatypes_table,
-       properties = {"ID" : synonym("metaGroupID"),
-                     "parent" : relation(Item, primaryjoin = metatypes_table.c.parentTypeID == items_table.c.typeID),
-                     "items" : relation(Item, primaryjoin = metatypes_table.c.typeID == items_table.c.typeID),
-                     "info": relation(MetaGroup, lazy=False)})
+       properties={"ID": synonym("metaGroupID"),
+                   "parent": relation(Item, primaryjoin=metatypes_table.c.parentTypeID == items_table.c.typeID),
+                   "items": relation(Item, primaryjoin=metatypes_table.c.typeID == items_table.c.typeID),
+                   "info": relation(MetaGroup, lazy=False)})
 
 MetaType.name = association_proxy("info", "name")
-
diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
index 6431b0cc76..b2db92437d 100644
--- a/eos/db/gamedata/queries.py
+++ b/eos/db/gamedata/queries.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,21 +15,23 @@
 #
 # 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.orm import join, exc
+from sqlalchemy.sql import and_, or_, select
+
+import eos.config
 from eos.db import gamedata_session
 from eos.db.gamedata.metaGroup import metatypes_table, items_table
-from sqlalchemy.sql import and_, or_, select, func
-from sqlalchemy.orm import join, exc
-from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup
 from eos.db.util import processEager, processWhere
-import eos.config
+from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup
 
 configVal = getattr(eos.config, "gamedataCache", None)
 if configVal is True:
     def cachedQuery(amount, *keywords):
         def deco(function):
             cache = {}
+
             def checkAndReturn(*args, **kwargs):
                 useCache = kwargs.pop("useCache", True)
                 cacheKey = []
@@ -45,6 +47,7 @@ def checkAndReturn(*args, **kwargs):
                 return handler
 
             return checkAndReturn
+
         return deco
 
 elif callable(configVal):
@@ -56,8 +59,10 @@ def checkAndReturn(*args, **kwargs):
                 return function(*args, **kwargs)
 
             return checkAndReturn
+
         return deco
 
+
 def sqlizeString(line):
     # Escape backslashes first, as they will be as escape symbol in queries
     # Then escape percent and underscore signs
@@ -65,7 +70,10 @@ def sqlizeString(line):
     line = line.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_").replace("*", "%")
     return line
 
+
 itemNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getItem(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -88,7 +96,10 @@ def getItem(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return item
 
+
 groupNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -111,63 +122,78 @@ def getGroup(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return group
 
+
 categoryNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getCategory(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             category = gamedata_session.query(Category).get(lookfor)
         else:
-            category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == lookfor).first()
+            category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                Category.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         if lookfor in categoryNameMap:
             id = categoryNameMap[lookfor]
             if eager is None:
                 category = gamedata_session.query(Category).get(id)
             else:
-                category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.ID == id).first()
+                category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                    Category.ID == id).first()
         else:
             # Category names are unique, so we can use first() instead of one()
-            category = gamedata_session.query(Category).options(*processEager(eager)).filter(Category.name == lookfor).first()
+            category = gamedata_session.query(Category).options(*processEager(eager)).filter(
+                Category.name == lookfor).first()
             categoryNameMap[lookfor] = category.ID
     else:
         raise TypeError("Need integer or string as argument")
     return category
 
+
 metaGroupNameMap = {}
+
+
 @cachedQuery(1, "lookfor")
 def getMetaGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             metaGroup = gamedata_session.query(MetaGroup).get(lookfor)
         else:
-            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == lookfor).first()
+            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                MetaGroup.ID == lookfor).first()
     elif isinstance(lookfor, basestring):
         if lookfor in metaGroupNameMap:
             id = metaGroupNameMap[lookfor]
             if eager is None:
                 metaGroup = gamedata_session.query(MetaGroup).get(id)
             else:
-                metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.ID == id).first()
+                metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                    MetaGroup.ID == id).first()
         else:
             # MetaGroup names are unique, so we can use first() instead of one()
-            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(MetaGroup.name == lookfor).first()
+            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
+                MetaGroup.name == lookfor).first()
             metaGroupNameMap[lookfor] = metaGroup.ID
     else:
         raise TypeError("Need integer or string as argument")
     return metaGroup
 
+
 @cachedQuery(1, "lookfor")
 def getMarketGroup(lookfor, eager=None):
     if isinstance(lookfor, int):
         if eager is None:
             marketGroup = gamedata_session.query(MarketGroup).get(lookfor)
         else:
-            marketGroup = gamedata_session.query(MarketGroup).options(*processEager(eager)).filter(MarketGroup.ID == lookfor).first()
+            marketGroup = gamedata_session.query(MarketGroup).options(*processEager(eager)).filter(
+                MarketGroup.ID == lookfor).first()
     else:
         raise TypeError("Need integer as argument")
     return marketGroup
 
+
 @cachedQuery(2, "where", "filter")
 def getItemsByCategory(filter, where=None, eager=None):
     if isinstance(filter, int):
@@ -178,7 +204,9 @@ def getItemsByCategory(filter, where=None, eager=None):
         raise TypeError("Need integer or string as argument")
 
     filter = processWhere(filter, where)
-    return gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category).filter(filter).all()
+    return gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category).filter(
+        filter).all()
+
 
 @cachedQuery(3, "where", "nameLike", "join")
 def searchItems(nameLike, where=None, join=None, eager=None):
@@ -201,6 +229,7 @@ def searchItems(nameLike, where=None, join=None, eager=None):
     items = items.limit(100).all()
     return items
 
+
 @cachedQuery(2, "where", "itemids")
 def getVariations(itemids, where=None, eager=None):
     for itemid in itemids:
@@ -213,9 +242,11 @@ def getVariations(itemids, where=None, eager=None):
     itemfilter = or_(*(metatypes_table.c.parentTypeID == itemid for itemid in itemids))
     filter = processWhere(itemfilter, where)
     joinon = items_table.c.typeID == metatypes_table.c.typeID
-    vars = gamedata_session.query(Item).options(*processEager(eager)).join((metatypes_table, joinon)).filter(filter).all()
+    vars = gamedata_session.query(Item).options(*processEager(eager)).join((metatypes_table, joinon)).filter(
+        filter).all()
     return vars
 
+
 @cachedQuery(1, "attr")
 def getAttributeInfo(attr, eager=None):
     if isinstance(attr, basestring):
@@ -230,6 +261,7 @@ def getAttributeInfo(attr, eager=None):
         result = None
     return result
 
+
 @cachedQuery(1, "field")
 def getMetaData(field):
     if isinstance(field, basestring):
@@ -238,6 +270,7 @@ def getMetaData(field):
         raise TypeError("Need string as argument")
     return data
 
+
 @cachedQuery(2, "itemIDs", "attributeID")
 def directAttributeRequest(itemIDs, attrIDs):
     for itemID in itemIDs:
@@ -248,8 +281,8 @@ def directAttributeRequest(itemIDs, attrIDs):
             raise TypeError("All itemIDs must be integer")
 
     q = select((eos.types.Item.typeID, eos.types.Attribute.attributeID, eos.types.Attribute.value),
-                                  and_(eos.types.Attribute.attributeID.in_(attrIDs), eos.types.Item.typeID.in_(itemIDs)),
-                                  from_obj=[join(eos.types.Attribute, eos.types.Item)])
+               and_(eos.types.Attribute.attributeID.in_(attrIDs), eos.types.Item.typeID.in_(itemIDs)),
+               from_obj=[join(eos.types.Attribute, eos.types.Item)])
 
     result = gamedata_session.execute(q).fetchall()
     return result
diff --git a/eos/db/gamedata/traits.py b/eos/db/gamedata/traits.py
index 907c532472..1dbc4d43d1 100644
--- a/eos/db/gamedata/traits.py
+++ b/eos/db/gamedata/traits.py
@@ -1,11 +1,11 @@
-
 from sqlalchemy import Column, Table, Integer, String, ForeignKey
 from sqlalchemy.orm import mapper
-from eos.types import Traits
+
 from eos.db import gamedata_meta
+from eos.types import Traits
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
                      Column("traitText", String))
 
-mapper(Traits, traits_table);
+mapper(Traits, traits_table)
diff --git a/eos/db/gamedata/unit.py b/eos/db/gamedata/unit.py
index 662c5cec55..55594eb90c 100644
--- a/eos/db/gamedata/unit.py
+++ b/eos/db/gamedata/unit.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 Column, Table, Integer, String
 from sqlalchemy.orm import mapper, synonym
@@ -24,10 +24,10 @@
 from eos.types import Unit
 
 groups_table = Table("dgmunits", gamedata_meta,
-                     Column("unitID", Integer, primary_key = True),
+                     Column("unitID", Integer, primary_key=True),
                      Column("unitName", String),
                      Column("displayName", String))
 
 mapper(Unit, groups_table,
-       properties = {"ID" : synonym("unitID"),
-                     "name" : synonym("unitName")})
+       properties={"ID": synonym("unitID"),
+                   "name": synonym("unitName")})
diff --git a/eos/db/migration.py b/eos/db/migration.py
index a0824f8125..6dc59565c8 100644
--- a/eos/db/migration.py
+++ b/eos/db/migration.py
@@ -1,20 +1,22 @@
-import config
+import logging
 import shutil
 import time
-import re
-import os
+
+import config
 import migrations
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
+
 def getAppVersion():
     return migrations.appVersion
 
+
 def update(saveddata_engine):
     dbVersion = getVersion(saveddata_engine)
     appVersion = getAppVersion()
@@ -24,7 +26,7 @@ def update(saveddata_engine):
 
     if dbVersion < appVersion:
         # Automatically backup database
-        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+        toFile = "%s/saveddata_migration_%d-%d_%s.db" % (
             config.savePath,
             dbVersion,
             appVersion,
@@ -33,9 +35,9 @@ def update(saveddata_engine):
         shutil.copyfile(config.saveDB, toFile)
 
         for version in xrange(dbVersion, appVersion):
-            func = migrations.updates[version+1]
+            func = migrations.updates[version + 1]
             if func:
-                logger.info("Applying database update: %d", version+1)
+                logger.info("Applying database update: %d", version + 1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current
diff --git a/eos/db/migrations/__init__.py b/eos/db/migrations/__init__.py
index 87988fb3d2..94b33409a8 100644
--- a/eos/db/migrations/__init__.py
+++ b/eos/db/migrations/__init__.py
@@ -11,7 +11,6 @@
 import pkgutil
 import re
 
-
 updates = {}
 appVersion = 0
 
diff --git a/eos/db/saveddata/__init__.py b/eos/db/saveddata/__init__.py
index c97707f682..d409e8ca7d 100644
--- a/eos/db/saveddata/__init__.py
+++ b/eos/db/saveddata/__init__.py
@@ -17,4 +17,3 @@
     "implantSet",
     "loadDefaultDatabaseValues"
 ]
-
diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py
index a31904b120..3a6334985d 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 @@ def __init__(self, effectID):
 
 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 deabd3b2e7..d4b8297775 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 e6be52535f..fad8c579da 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 0934f177ec..2cbeeb44a7 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 c29fa7754b..a9e59f228f 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.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 94d7e898ba..7163c06ffe 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 2f4089756d..7074369dae 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 060d7b2a1d..40b92af04d 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 @@ def __repr__(self):
             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 @@ def __repr__(self):
 )
 
 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 8f0e6736be..eb644b02e4 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 c74def1576..21145698f3 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.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 73036de91c..042e986f6c 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 1d44f70767..3dcccca68e 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,104 +15,104 @@
 #
 # 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
+
     instance = None
 
     @classmethod
-    def importDamageProfileDefaults(self):
-        damageProfileList = []
-        damageProfileList.append(["Uniform", "25", "25", "25", "25"])
-        damageProfileList.append(["[Generic]EM", "100", "0", "0", "0"])
-        damageProfileList.append(["[Generic]Thermal", "0", "100", "0", "0"])
-        damageProfileList.append(["[Generic]Kinetic", "0", "0", "100", "0"])
-        damageProfileList.append(["[Generic]Explosive", "0", "0", "0", "100"])
-        damageProfileList.append(["[NPC][Asteroid] Blood Raiders", "5067", "4214", "0", "0"])
-        damageProfileList.append(["[Bombs]Concussion Bomb", "0", "0", "6400", "0"])
-        damageProfileList.append(["[Bombs]Electron Bomb", "6400", "0", "0", "0"])
-        damageProfileList.append(["[Bombs]Scorch Bomb", "0", "6400", "0", "0"])
-        damageProfileList.append(["[Bombs]Shrapnel Bomb", "0", "0", "0", "6400"])
-        damageProfileList.append(["[Frequency Crystals][T2] Gleam", "56", "56", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals][T2] Aurora", "40", "24", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Gamma", "61.6", "35.2", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Infrared", "44", "17.6", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Microwave", "35.2", "17.6", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Radio", "44", "0", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Standard", "44", "26.4", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"])
-        damageProfileList.append(["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"])
-        damageProfileList.append(["[Hybrid Charges][T2] Void", "0", "61.6", "61.6", "0"])
-        damageProfileList.append(["[Hybrid Charges][T2] Null", "0", "48", "40", "0"])
-        damageProfileList.append(["[Hybrid Charges][T2] Javelin", "0", "64", "48", "0"])
-        damageProfileList.append(["[Hybrid Charges][T2] Spike", "0", "32", "32", "0"])
-        damageProfileList.append(["[Hybrid Charges]Antimatter", "0", "48", "67.2", "0"])
-        damageProfileList.append(["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"])
-        damageProfileList.append(["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"])
-        damageProfileList.append(["[Hybrid Charges]Lead", "0", "28.8", "48", "0"])
-        damageProfileList.append(["[Hybrid Charges]Plutonium", "0", "48", "57.6", "0"])
-        damageProfileList.append(["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"])
-        damageProfileList.append(["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"])
-        damageProfileList.append(["[Hybrid Charges]Uranium", "0", "38.4", "57.6", "0"])
-        damageProfileList.append(["[Missiles]Mjolnir", "100", "0", "0", "0"])
-        damageProfileList.append(["[Missiles]Inferno", "0", "100", "0", "0"])
-        damageProfileList.append(["[Missiles]Scourge", "0", "0", "100", "0"])
-        damageProfileList.append(["[Missiles]Nova", "0", "0", "0", "100"])
-        damageProfileList.append(["[Missiles][Structure) Standup Missile", "100", "100", "100", "100"])
-        damageProfileList.append(["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"])
-        damageProfileList.append(["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"])
-        damageProfileList.append(["[Projectile Ammo][T2] Hail", "0", "0", "26.4", "96.8"])
-        damageProfileList.append(["[Projectile Ammo][T2] Barrage", "0", "0", "40", "48"])
-        damageProfileList.append(["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"])
-        damageProfileList.append(["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"])
-        damageProfileList.append(["[Projectile Ammo]EMP", "79.2", "0", "8.8", "17.6"])
-        damageProfileList.append(["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"])
-        damageProfileList.append(["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"])
-        damageProfileList.append(["[Projectile Ammo]Phased Plasma", "0", "88", "17.6", "0"])
-        damageProfileList.append(["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"])
-        damageProfileList.append(["[Projectile Ammo]Titanium Sabot", "0", "0", "52.8", "176"])
-        damageProfileList.append(["[NPC][Burner] Cruor (Blood Raiders)", "90", "90", "0", "0"])
-        damageProfileList.append(["[NPC][Burner] Dramiel (Angel)", "55", "0", "20", "96"])
-        damageProfileList.append(["[NPC][Burner] Daredevil (Serpentis)", "0", "110", "154", "0"])
-        damageProfileList.append(["[NPC][Burner] Succubus (Sanshas Nation)", "135", "30", "0", "0"])
-        damageProfileList.append(["[NPC][Burner] Worm (Guristas)", "0", "0", "228", "0"])
-        damageProfileList.append(["[NPC][Burner] Enyo", "0", "147", "147", "0"])
-        damageProfileList.append(["[NPC][Burner] Hawk", "0", "0", "247", "0"])
-        damageProfileList.append(["[NPC][Burner] Jaguar", "36", "0", "50", "182"])
-        damageProfileList.append(["[NPC][Burner] Vengeance", "232", "0", "0", "0"])
-        damageProfileList.append(["[NPC][Burner] Ashimmu (Blood Raiders)", "260", "100", "0", "0"])
-        damageProfileList.append(["[NPC][Burner] Talos", "0", "413", "413", "0"])
-        damageProfileList.append(["[NPC][Burner] Sentinel", "0", "75", "0", "90"])
-        damageProfileList.append(["[NPC][Asteroid] Angel Cartel", "1838", "562", "2215", "3838"])
-        damageProfileList.append(["[NPC][Deadspace] Angel Cartel", "369", "533", "1395", "3302"])
-        damageProfileList.append(["[NPC][Deadspace] Blood Raiders", "6040", "5052", "10", "15"])
-        damageProfileList.append(["[NPC][Asteroid] Guristas", "0", "1828", "7413", "0"])
-        damageProfileList.append(["[NPC][Deadspace] Guristas", "0", "1531", "9680", "0"])
-        damageProfileList.append(["[NPC][Asteroid] Rogue Drone", "394", "666", "1090", "1687"])
-        damageProfileList.append(["[NPC][Deadspace] Rogue Drone", "276", "1071", "1069", "871"])
-        damageProfileList.append(["[NPC][Asteroid] Sanshas Nation", "5586", "4112", "0", "0"])
-        damageProfileList.append(["[NPC][Deadspace] Sanshas Nation", "3009", "2237", "0", "0"])
-        damageProfileList.append(["[NPC][Asteroid] Serpentis", "0", "5373", "4813", "0"])
-        damageProfileList.append(["[NPC][Deadspace] Serpentis", "0", "3110", "1929", "0"])
-        damageProfileList.append(["[NPC][Mission] Amarr Empire", "4464", "3546", "97", "0"])
-        damageProfileList.append(["[NPC][Mission] Caldari State", "0", "2139", "4867", "0"])
-        damageProfileList.append(["[NPC][Mission] CONCORD", "336", "134", "212", "412"])
-        damageProfileList.append(["[NPC][Mission] Gallente Federation", "9", "3712", "2758", "0"])
-        damageProfileList.append(["[NPC][Mission] Khanid", "612", "483", "43", "6"])
-        damageProfileList.append(["[NPC][Mission] Minmatar Republic", "1024", "388", "1655", "4285"])
-        damageProfileList.append(["[NPC][Mission] Mordus Legion", "25", "262", "625", "0"])
-        damageProfileList.append(["[NPC][Mission] Thukker", "0", "52", "10", "79"])
-        damageProfileList.append(["[NPC][Other] Sleepers", "1472", "1472", "1384", "1384"])
-        damageProfileList.append(["[NPC][Other] Sansha Incursion", "1682", "1347", "3678", "3678"])
+    def importDamageProfileDefaults(cls):
+        damageProfileList = [["Uniform", "25", "25", "25", "25"], ["[Generic]EM", "100", "0", "0", "0"],
+                             ["[Generic]Thermal", "0", "100", "0", "0"], ["[Generic]Kinetic", "0", "0", "100", "0"],
+                             ["[Generic]Explosive", "0", "0", "0", "100"],
+                             ["[NPC][Asteroid] Blood Raiders", "5067", "4214", "0", "0"],
+                             ["[Bombs]Concussion Bomb", "0", "0", "6400", "0"],
+                             ["[Bombs]Electron Bomb", "6400", "0", "0", "0"],
+                             ["[Bombs]Scorch Bomb", "0", "6400", "0", "0"],
+                             ["[Bombs]Shrapnel Bomb", "0", "0", "0", "6400"],
+                             ["[Frequency Crystals][T2] Gleam", "56", "56", "0", "0"],
+                             ["[Frequency Crystals][T2] Aurora", "40", "24", "0", "0"],
+                             ["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"],
+                             ["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"],
+                             ["[Frequency Crystals]Gamma", "61.6", "35.2", "0", "0"],
+                             ["[Frequency Crystals]Infrared", "44", "17.6", "0", "0"],
+                             ["[Frequency Crystals]Microwave", "35.2", "17.6", "0", "0"],
+                             ["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"],
+                             ["[Frequency Crystals]Radio", "44", "0", "0", "0"],
+                             ["[Frequency Crystals]Standard", "44", "26.4", "0", "0"],
+                             ["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"],
+                             ["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"],
+                             ["[Hybrid Charges][T2] Void", "0", "61.6", "61.6", "0"],
+                             ["[Hybrid Charges][T2] Null", "0", "48", "40", "0"],
+                             ["[Hybrid Charges][T2] Javelin", "0", "64", "48", "0"],
+                             ["[Hybrid Charges][T2] Spike", "0", "32", "32", "0"],
+                             ["[Hybrid Charges]Antimatter", "0", "48", "67.2", "0"],
+                             ["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"],
+                             ["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"],
+                             ["[Hybrid Charges]Lead", "0", "28.8", "48", "0"],
+                             ["[Hybrid Charges]Plutonium", "0", "48", "57.6", "0"],
+                             ["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"],
+                             ["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"],
+                             ["[Hybrid Charges]Uranium", "0", "38.4", "57.6", "0"],
+                             ["[Missiles]Mjolnir", "100", "0", "0", "0"], ["[Missiles]Inferno", "0", "100", "0", "0"],
+                             ["[Missiles]Scourge", "0", "0", "100", "0"], ["[Missiles]Nova", "0", "0", "0", "100"],
+                             ["[Missiles][Structure) Standup Missile", "100", "100", "100", "100"],
+                             ["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"],
+                             ["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"],
+                             ["[Projectile Ammo][T2] Hail", "0", "0", "26.4", "96.8"],
+                             ["[Projectile Ammo][T2] Barrage", "0", "0", "40", "48"],
+                             ["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"],
+                             ["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"],
+                             ["[Projectile Ammo]EMP", "79.2", "0", "8.8", "17.6"],
+                             ["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"],
+                             ["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"],
+                             ["[Projectile Ammo]Phased Plasma", "0", "88", "17.6", "0"],
+                             ["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"],
+                             ["[Projectile Ammo]Titanium Sabot", "0", "0", "52.8", "176"],
+                             ["[NPC][Burner] Cruor (Blood Raiders)", "90", "90", "0", "0"],
+                             ["[NPC][Burner] Dramiel (Angel)", "55", "0", "20", "96"],
+                             ["[NPC][Burner] Daredevil (Serpentis)", "0", "110", "154", "0"],
+                             ["[NPC][Burner] Succubus (Sanshas Nation)", "135", "30", "0", "0"],
+                             ["[NPC][Burner] Worm (Guristas)", "0", "0", "228", "0"],
+                             ["[NPC][Burner] Enyo", "0", "147", "147", "0"],
+                             ["[NPC][Burner] Hawk", "0", "0", "247", "0"],
+                             ["[NPC][Burner] Jaguar", "36", "0", "50", "182"],
+                             ["[NPC][Burner] Vengeance", "232", "0", "0", "0"],
+                             ["[NPC][Burner] Ashimmu (Blood Raiders)", "260", "100", "0", "0"],
+                             ["[NPC][Burner] Talos", "0", "413", "413", "0"],
+                             ["[NPC][Burner] Sentinel", "0", "75", "0", "90"],
+                             ["[NPC][Asteroid] Angel Cartel", "1838", "562", "2215", "3838"],
+                             ["[NPC][Deadspace] Angel Cartel", "369", "533", "1395", "3302"],
+                             ["[NPC][Deadspace] Blood Raiders", "6040", "5052", "10", "15"],
+                             ["[NPC][Asteroid] Guristas", "0", "1828", "7413", "0"],
+                             ["[NPC][Deadspace] Guristas", "0", "1531", "9680", "0"],
+                             ["[NPC][Asteroid] Rogue Drone", "394", "666", "1090", "1687"],
+                             ["[NPC][Deadspace] Rogue Drone", "276", "1071", "1069", "871"],
+                             ["[NPC][Asteroid] Sanshas Nation", "5586", "4112", "0", "0"],
+                             ["[NPC][Deadspace] Sanshas Nation", "3009", "2237", "0", "0"],
+                             ["[NPC][Asteroid] Serpentis", "0", "5373", "4813", "0"],
+                             ["[NPC][Deadspace] Serpentis", "0", "3110", "1929", "0"],
+                             ["[NPC][Mission] Amarr Empire", "4464", "3546", "97", "0"],
+                             ["[NPC][Mission] Caldari State", "0", "2139", "4867", "0"],
+                             ["[NPC][Mission] CONCORD", "336", "134", "212", "412"],
+                             ["[NPC][Mission] Gallente Federation", "9", "3712", "2758", "0"],
+                             ["[NPC][Mission] Khanid", "612", "483", "43", "6"],
+                             ["[NPC][Mission] Minmatar Republic", "1024", "388", "1655", "4285"],
+                             ["[NPC][Mission] Mordus Legion", "25", "262", "625", "0"],
+                             ["[NPC][Mission] Thukker", "0", "52", "10", "79"],
+                             ["[NPC][Other] Sleepers", "1472", "1472", "1384", "1384"],
+                             ["[NPC][Other] Sansha Incursion", "1682", "1347", "3678", "3678"]]
 
         for damageProfileRow in damageProfileList:
             name, em, therm, kin, exp = damageProfileRow
@@ -123,59 +123,58 @@ def importDamageProfileDefaults(self):
                 eos.db.save(damageProfile)
 
     @classmethod
-    def importResistProfileDefaults(self):
-        targetResistProfileList = []
-        targetResistProfileList.append(["Uniform (25%)", "0.25", "0.25", "0.25", "0.25"])
-        targetResistProfileList.append(["Uniform (50%)", "0.50", "0.50", "0.50", "0.50"])
-        targetResistProfileList.append(["Uniform (75%)", "0.75", "0.75", "0.75", "0.75"])
-        targetResistProfileList.append(["Uniform (90%)", "0.90", "0.90", "0.90", "0.90"])
-        targetResistProfileList.append(["[T1 Resist]Shield", "0.0", "0.20", "0.40", "0.50"])
-        targetResistProfileList.append(["[T1 Resist]Armor", "0.50", "0.45", "0.25", "0.10"])
-        targetResistProfileList.append(["[T1 Resist]Hull", "0.33", "0.33", "0.33", "0.33"])
-        targetResistProfileList.append(["[T1 Resist]Shield (+T2 DCU)", "0.125", "0.30", "0.475", "0.562"])
-        targetResistProfileList.append(["[T1 Resist]Armor (+T2 DCU)", "0.575", "0.532", "0.363", "0.235"])
-        targetResistProfileList.append(["[T1 Resist]Hull (+T2 DCU)", "0.598", "0.598", "0.598", "0.598"])
-        targetResistProfileList.append(["[T2 Resist]Amarr (Shield)", "0.0", "0.20", "0.70", "0.875"])
-        targetResistProfileList.append(["[T2 Resist]Amarr (Armor)", "0.50", "0.35", "0.625", "0.80"])
-        targetResistProfileList.append(["[T2 Resist]Caldari (Shield)", "0.20", "0.84", "0.76", "0.60"])
-        targetResistProfileList.append(["[T2 Resist]Caldari (Armor)", "0.50", "0.8625", "0.625", "0.10"])
-        targetResistProfileList.append(["[T2 Resist]Gallente (Shield)", "0.0", "0.60", "0.85", "0.50"])
-        targetResistProfileList.append(["[T2 Resist]Gallente (Armor)", "0.50", "0.675", "0.8375", "0.10"])
-        targetResistProfileList.append(["[T2 Resist]Minmatar (Shield)", "0.75", "0.60", "0.40", "0.50"])
-        targetResistProfileList.append(["[T2 Resist]Minmatar (Armor)", "0.90", "0.675", "0.25", "0.10"])
-        targetResistProfileList.append(["[NPC][Asteroid] Angel Cartel", "0.54", "0.42", "0.37", "0.32"])
-        targetResistProfileList.append(["[NPC][Asteroid] Blood Raiders", "0.34", "0.39", "0.45", "0.52"])
-        targetResistProfileList.append(["[NPC][Asteroid] Guristas", "0.55", "0.35", "0.3", "0.48"])
-        targetResistProfileList.append(["[NPC][Asteroid] Rogue Drones", "0.35", "0.38", "0.44", "0.49"])
-        targetResistProfileList.append(["[NPC][Asteroid] Sanshas Nation", "0.35", "0.4", "0.47", "0.53"])
-        targetResistProfileList.append(["[NPC][Asteroid] Serpentis", "0.49", "0.38", "0.29", "0.51"])
-        targetResistProfileList.append(["[NPC][Deadspace] Angel Cartel", "0.59", "0.48", "0.4", "0.32"])
-        targetResistProfileList.append(["[NPC][Deadspace] Blood Raiders", "0.31", "0.39", "0.47", "0.56"])
-        targetResistProfileList.append(["[NPC][Deadspace] Guristas", "0.57", "0.39", "0.31", "0.5"])
-        targetResistProfileList.append(["[NPC][Deadspace] Rogue Drones", "0.42", "0.42", "0.47", "0.49"])
-        targetResistProfileList.append(["[NPC][Deadspace] Sanshas Nation", "0.31", "0.39", "0.47", "0.56"])
-        targetResistProfileList.append(["[NPC][Deadspace] Serpentis", "0.49", "0.38", "0.29", "0.56"])
-        targetResistProfileList.append(["[NPC][Mission] Amarr Empire", "0.34", "0.38", "0.42", "0.46"])
-        targetResistProfileList.append(["[NPC][Mission] Caldari State", "0.51", "0.38", "0.3", "0.51"])
-        targetResistProfileList.append(["[NPC][Mission] CONCORD", "0.47", "0.46", "0.47", "0.47"])
-        targetResistProfileList.append(["[NPC][Mission] Gallente Federation", "0.51", "0.38", "0.31", "0.52"])
-        targetResistProfileList.append(["[NPC][Mission] Khanid", "0.51", "0.42", "0.36", "0.4"])
-        targetResistProfileList.append(["[NPC][Mission] Minmatar Republic", "0.51", "0.46", "0.41", "0.35"])
-        targetResistProfileList.append(["[NPC][Mission] Mordus Legion", "0.32", "0.48", "0.4", "0.62"])
-        targetResistProfileList.append(["[NPC][Other] Sleeper", "0.61", "0.61", "0.61", "0.61"])
-        targetResistProfileList.append(["[NPC][Other] Sansha Incursion", "0.65", "0.63", "0.64", "0.65"])
-        targetResistProfileList.append(["[NPC][Burner] Cruor (Blood Raiders)", "0.8", "0.73", "0.69", "0.67"])
-        targetResistProfileList.append(["[NPC][Burner] Dramiel (Angel)", "0.35", "0.48", "0.61", "0.68"])
-        targetResistProfileList.append(["[NPC][Burner] Daredevil (Serpentis)", "0.69", "0.59", "0.59", "0.43"])
-        targetResistProfileList.append(["[NPC][Burner] Succubus (Sanshas Nation)", "0.35", "0.48", "0.61", "0.68"])
-        targetResistProfileList.append(["[NPC][Burner] Worm (Guristas)", "0.48", "0.58", "0.69", "0.74"])
-        targetResistProfileList.append(["[NPC][Burner] Enyo", "0.58", "0.72", "0.86", "0.24"])
-        targetResistProfileList.append(["[NPC][Burner] Hawk", "0.3", "0.86", "0.79", "0.65"])
-        targetResistProfileList.append(["[NPC][Burner] Jaguar", "0.78", "0.65", "0.48", "0.56"])
-        targetResistProfileList.append(["[NPC][Burner] Vengeance", "0.66", "0.56", "0.75", "0.86"])
-        targetResistProfileList.append(["[NPC][Burner] Ashimmu (Blood Raiders)", "0.8", "0.76", "0.68", "0.7"])
-        targetResistProfileList.append(["[NPC][Burner] Talos", "0.68", "0.59", "0.59", "0.43"])
-        targetResistProfileList.append(["[NPC][Burner] Sentinel", "0.58", "0.45", "0.52", "0.66"])
+    def importResistProfileDefaults(cls):
+        targetResistProfileList = [["Uniform (25%)", "0.25", "0.25", "0.25", "0.25"],
+                                   ["Uniform (50%)", "0.50", "0.50", "0.50", "0.50"],
+                                   ["Uniform (75%)", "0.75", "0.75", "0.75", "0.75"],
+                                   ["Uniform (90%)", "0.90", "0.90", "0.90", "0.90"],
+                                   ["[T1 Resist]Shield", "0.0", "0.20", "0.40", "0.50"],
+                                   ["[T1 Resist]Armor", "0.50", "0.45", "0.25", "0.10"],
+                                   ["[T1 Resist]Hull", "0.33", "0.33", "0.33", "0.33"],
+                                   ["[T1 Resist]Shield (+T2 DCU)", "0.125", "0.30", "0.475", "0.562"],
+                                   ["[T1 Resist]Armor (+T2 DCU)", "0.575", "0.532", "0.363", "0.235"],
+                                   ["[T1 Resist]Hull (+T2 DCU)", "0.598", "0.598", "0.598", "0.598"],
+                                   ["[T2 Resist]Amarr (Shield)", "0.0", "0.20", "0.70", "0.875"],
+                                   ["[T2 Resist]Amarr (Armor)", "0.50", "0.35", "0.625", "0.80"],
+                                   ["[T2 Resist]Caldari (Shield)", "0.20", "0.84", "0.76", "0.60"],
+                                   ["[T2 Resist]Caldari (Armor)", "0.50", "0.8625", "0.625", "0.10"],
+                                   ["[T2 Resist]Gallente (Shield)", "0.0", "0.60", "0.85", "0.50"],
+                                   ["[T2 Resist]Gallente (Armor)", "0.50", "0.675", "0.8375", "0.10"],
+                                   ["[T2 Resist]Minmatar (Shield)", "0.75", "0.60", "0.40", "0.50"],
+                                   ["[T2 Resist]Minmatar (Armor)", "0.90", "0.675", "0.25", "0.10"],
+                                   ["[NPC][Asteroid] Angel Cartel", "0.54", "0.42", "0.37", "0.32"],
+                                   ["[NPC][Asteroid] Blood Raiders", "0.34", "0.39", "0.45", "0.52"],
+                                   ["[NPC][Asteroid] Guristas", "0.55", "0.35", "0.3", "0.48"],
+                                   ["[NPC][Asteroid] Rogue Drones", "0.35", "0.38", "0.44", "0.49"],
+                                   ["[NPC][Asteroid] Sanshas Nation", "0.35", "0.4", "0.47", "0.53"],
+                                   ["[NPC][Asteroid] Serpentis", "0.49", "0.38", "0.29", "0.51"],
+                                   ["[NPC][Deadspace] Angel Cartel", "0.59", "0.48", "0.4", "0.32"],
+                                   ["[NPC][Deadspace] Blood Raiders", "0.31", "0.39", "0.47", "0.56"],
+                                   ["[NPC][Deadspace] Guristas", "0.57", "0.39", "0.31", "0.5"],
+                                   ["[NPC][Deadspace] Rogue Drones", "0.42", "0.42", "0.47", "0.49"],
+                                   ["[NPC][Deadspace] Sanshas Nation", "0.31", "0.39", "0.47", "0.56"],
+                                   ["[NPC][Deadspace] Serpentis", "0.49", "0.38", "0.29", "0.56"],
+                                   ["[NPC][Mission] Amarr Empire", "0.34", "0.38", "0.42", "0.46"],
+                                   ["[NPC][Mission] Caldari State", "0.51", "0.38", "0.3", "0.51"],
+                                   ["[NPC][Mission] CONCORD", "0.47", "0.46", "0.47", "0.47"],
+                                   ["[NPC][Mission] Gallente Federation", "0.51", "0.38", "0.31", "0.52"],
+                                   ["[NPC][Mission] Khanid", "0.51", "0.42", "0.36", "0.4"],
+                                   ["[NPC][Mission] Minmatar Republic", "0.51", "0.46", "0.41", "0.35"],
+                                   ["[NPC][Mission] Mordus Legion", "0.32", "0.48", "0.4", "0.62"],
+                                   ["[NPC][Other] Sleeper", "0.61", "0.61", "0.61", "0.61"],
+                                   ["[NPC][Other] Sansha Incursion", "0.65", "0.63", "0.64", "0.65"],
+                                   ["[NPC][Burner] Cruor (Blood Raiders)", "0.8", "0.73", "0.69", "0.67"],
+                                   ["[NPC][Burner] Dramiel (Angel)", "0.35", "0.48", "0.61", "0.68"],
+                                   ["[NPC][Burner] Daredevil (Serpentis)", "0.69", "0.59", "0.59", "0.43"],
+                                   ["[NPC][Burner] Succubus (Sanshas Nation)", "0.35", "0.48", "0.61", "0.68"],
+                                   ["[NPC][Burner] Worm (Guristas)", "0.48", "0.58", "0.69", "0.74"],
+                                   ["[NPC][Burner] Enyo", "0.58", "0.72", "0.86", "0.24"],
+                                   ["[NPC][Burner] Hawk", "0.3", "0.86", "0.79", "0.65"],
+                                   ["[NPC][Burner] Jaguar", "0.78", "0.65", "0.48", "0.56"],
+                                   ["[NPC][Burner] Vengeance", "0.66", "0.56", "0.75", "0.86"],
+                                   ["[NPC][Burner] Ashimmu (Blood Raiders)", "0.8", "0.76", "0.68", "0.7"],
+                                   ["[NPC][Burner] Talos", "0.68", "0.59", "0.59", "0.43"],
+                                   ["[NPC][Burner] Sentinel", "0.58", "0.45", "0.52", "0.66"]]
 
         for targetResistProfileRow in targetResistProfileList:
             name, em, therm, kin, exp = targetResistProfileRow
@@ -186,9 +185,8 @@ def importResistProfileDefaults(self):
                 eos.db.save(resistsProfile)
 
     @classmethod
-    def importRequiredDefaults(self):
-        damageProfileList = []
-        damageProfileList.append(["Uniform", "25", "25", "25", "25"])
+    def importRequiredDefaults(cls):
+        damageProfileList = [["Uniform", "25", "25", "25", "25"]]
 
         for damageProfileRow in damageProfileList:
             name, em, therm, kin, exp = damageProfileRow
diff --git a/eos/db/saveddata/miscData.py b/eos/db/saveddata/miscData.py
index 44d586d730..ac4c85b2d4 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 a89f7b6366..d6c2b068c7 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.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 8245463e38..e260cd3df1 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.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 172dfba492..021d341e8b 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 5a6dd1bfcc..bcecb3b699 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,33 @@
 #
 # 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 sqlalchemy.sql import and_
 
-from eos.types import *
-from eos.db.saveddata.fleet import squadmembers_table
+from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
-from sqlalchemy.sql import and_
+from eos.db.saveddata.fleet import squadmembers_table
+from eos.db.util import processEager, processWhere
+from eos.types import *
+
 import eos.config
 
 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 +50,7 @@ def setCache(cacheKey, args, kwargs):
                 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 +76,7 @@ def checkAndReturn(*args, **kwargs):
                         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,11 +88,14 @@ def checkAndReturn(*args, **kwargs):
                             break
 
                 return items
+
             return checkAndReturn
+
         return deco
 
+
     def removeCachedEntry(type, ID):
-        if not type in queryCache:
+        if type not in queryCache:
             return
         functionCache = queryCache[type]
         for _, localCache in functionCache.iteritems():
@@ -111,11 +120,14 @@ def checkAndReturn(*args, **kwargs):
                 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 +135,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 +154,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 +168,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 +191,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 +212,7 @@ def getFit(lookfor, eager=None):
 
     return fit
 
+
 @cachedQuery(Fleet, 1, "fleetID")
 def getFleet(fleetID, eager=None):
     if isinstance(fleetID, int):
@@ -208,6 +227,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 +242,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 +257,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 +279,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 +299,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 +326,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 +334,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 +351,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 +367,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 +398,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 +419,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 +440,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 +450,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 +465,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 +486,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 +512,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 +541,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 38bd1ea9a1..1c488a2cdf 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.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 f7106fe45f..88c1ca1047 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.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 f2a9146914..f7ec106293 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.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)
diff --git a/eos/db/util.py b/eos/db/util.py
index 47a950c804..151e2e38b6 100644
--- a/eos/db/util.py
+++ b/eos/db/util.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,10 +15,10 @@
 #
 # 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.orm import eagerload
-from sqlalchemy.sql import and_, or_
+from sqlalchemy.sql import and_
 
 replace = {"attributes": "_Item__attributes",
            "modules": "_Fit__modules",
@@ -31,8 +31,9 @@
            "damagePattern": "_Fit__damagePattern",
            "projectedFits": "_Fit__projectedFits"}
 
+
 def processEager(eager):
-    if eager == None:
+    if eager is None:
         return tuple()
     else:
         l = []
@@ -44,6 +45,7 @@ def processEager(eager):
 
         return l
 
+
 def _replacements(eagerString):
     splitEager = eagerString.split(".")
     for i in xrange(len(splitEager)):
@@ -54,6 +56,7 @@ def _replacements(eagerString):
 
     return ".".join(splitEager)
 
+
 def processWhere(clause, where):
     if where is not None:
         if not hasattr(where, "__iter__"):
diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index 75b51715de..2e42ef69fb 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,15 +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.orm.attributes import flag_modified
+import logging
 
-#from sqlalchemy.orm.attributes import flag_modified
 import eos.db
 import eos.types
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):
         for element in self:
@@ -108,11 +110,12 @@ def filteredChargeForce(self, filter, *args, **kwargs):
     def remove(self, thing):
         # We must flag it as modified, otherwise it not be removed from the database
         # @todo: flag_modified isn't in os x skel. need to rebuild to include
-        #flag_modified(thing, "itemID")
+        # flag_modified(thing, "itemID")
         if thing.isInvalid:  # see GH issue #324
             thing.itemID = 0
         list.remove(self, thing)
 
+
 class HandledModuleList(HandledList):
     def append(self, mod):
         emptyPosition = float("Inf")
@@ -169,11 +172,12 @@ def toModule(self, index, mod):
         self[index] = mod
 
     def freeSlot(self, slot):
-        for i in range(len(self) -1, -1, -1):
+        for i in range(len(self) - 1, -1, -1):
             mod = self[i]
             if mod.getModifiedItemAttr("subSystemSlot") == slot:
                 del self[i]
 
+
 class HandledDroneCargoList(HandledList):
     def find(self, item):
         for o in self:
@@ -190,6 +194,7 @@ def append(self, thing):
         if thing.isInvalid:
             self.remove(thing)
 
+
 class HandledImplantBoosterList(HandledList):
     def append(self, thing):
         if thing.isInvalid:
@@ -206,6 +211,7 @@ def append(self, thing):
 
         HandledList.append(self, thing)
 
+
 class HandledProjectedModList(HandledList):
     def append(self, proj):
         if proj.isInvalid:
@@ -232,6 +238,7 @@ def append(self, proj):
         if not proj.item.isType("projected") and not isSystemEffect:
             self.remove(proj)
 
+
 class HandledProjectedDroneList(HandledDroneCargoList):
     def append(self, proj):
         proj.projected = True
@@ -241,6 +248,7 @@ def append(self, proj):
         if proj.isInvalid or not proj.item.isType("projected"):
             self.remove(proj)
 
+
 class HandledItem(object):
     def preAssignItemAttr(self, *args, **kwargs):
         self.itemModifiedAttributes.preAssign(*args, **kwargs)
@@ -257,6 +265,7 @@ def boostItemAttr(self, *args, **kwargs):
     def forceItemAttr(self, *args, **kwargs):
         self.itemModifiedAttributes.force(*args, **kwargs)
 
+
 class HandledCharge(object):
     def preAssignChargeAttr(self, *args, **kwargs):
         self.chargeModifiedAttributes.preAssign(*args, **kwargs)
diff --git a/eos/effects/__init__.py b/eos/effects/__init__.py
index a0c0db7615..daa8ffc73c 100644
--- a/eos/effects/__init__.py
+++ b/eos/effects/__init__.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #               2010 Anton Vorobyov
 #
@@ -16,4 +16,4 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
diff --git a/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py b/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py
index d50c487045..acf8b25e30 100644
--- a/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py
+++ b/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Dynamic Fuel Valve (8 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "capacitorNeed", container.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/accerationcontrolskillabmwdspeedboost.py b/eos/effects/accerationcontrolskillabmwdspeedboost.py
index 31ad6f368d..ef24601d2f 100644
--- a/eos/effects/accerationcontrolskillabmwdspeedboost.py
+++ b/eos/effects/accerationcontrolskillabmwdspeedboost.py
@@ -4,6 +4,8 @@
 # Implant: Zor's Custom Navigation Hyper-Link
 # Skill: Acceleration Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
diff --git a/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py b/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py
index 2babbbb089..dc38ae5f83 100644
--- a/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py
+++ b/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "speedFactor", implant.getModifiedItemAttr("speedFBonus"))
diff --git a/eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py b/eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py
index 7416d1b96f..3fb468dea3 100644
--- a/eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py
+++ b/eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py
@@ -5,6 +5,8 @@
 # Implant: Poteque 'Prospector' Archaeology AC-905
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),
                                      "accessDifficultyBonus",
diff --git a/eos/effects/accessdifficultybonusmodifierrequiringhacking.py b/eos/effects/accessdifficultybonusmodifierrequiringhacking.py
index 9a44b14b86..6bb5ffdd76 100644
--- a/eos/effects/accessdifficultybonusmodifierrequiringhacking.py
+++ b/eos/effects/accessdifficultybonusmodifierrequiringhacking.py
@@ -5,7 +5,9 @@
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill("Hacking"),
-                                  "accessDifficultyBonus",
-                                  container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
+                                     "accessDifficultyBonus",
+                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
diff --git a/eos/effects/addtosignatureradius2.py b/eos/effects/addtosignatureradius2.py
index 797729dff4..550357bfc6 100644
--- a/eos/effects/addtosignatureradius2.py
+++ b/eos/effects/addtosignatureradius2.py
@@ -4,5 +4,7 @@
 # Modules from group: Missile Launcher Bomb (2 of 2)
 # Modules from group: Shield Extender (33 of 33)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
diff --git a/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py b/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py
index be22017177..48340f4141 100644
--- a/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py
+++ b/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Advanced Drone Interfacing
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Fighter Support Unit",
                                      "maxGroupActive", skill.level)
diff --git a/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py b/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py
index 128811884a..1d1b9c3092 100644
--- a/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py
+++ b/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py
@@ -5,7 +5,9 @@
 # Implant: Zor's Custom Navigation Link
 # Skill: Afterburner
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                     "duration", container.getModifiedItemAttr("durationBonus") * level)
+                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/agilitymultipliereffect.py b/eos/effects/agilitymultipliereffect.py
index 11306be367..fe8b37aa4a 100644
--- a/eos/effects/agilitymultipliereffect.py
+++ b/eos/effects/agilitymultipliereffect.py
@@ -5,7 +5,9 @@
 # Modules from group: Nanofiber Internal Structure (7 of 7)
 # Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("agility",
                            module.getModifiedItemAttr("agilityMultiplier"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/agilitymultipliereffectpassive.py b/eos/effects/agilitymultipliereffectpassive.py
index bded76718c..affa839e88 100644
--- a/eos/effects/agilitymultipliereffectpassive.py
+++ b/eos/effects/agilitymultipliereffectpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties = True)
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/ammofallofmultiplier.py b/eos/effects/ammofallofmultiplier.py
index fb82e7f879..4f4f5e86ff 100644
--- a/eos/effects/ammofallofmultiplier.py
+++ b/eos/effects/ammofallofmultiplier.py
@@ -8,5 +8,7 @@
 # Charges from group: Advanced Pulse Laser Crystal (8 of 8)
 # Charges from group: Advanced Railgun Charge (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)
diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index ee58865b7f..817f1d7db4 100644
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -3,6 +3,8 @@
 # Used by:
 # Items from category: Charge (465 of 884)
 type = "passive"
+
+
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster
     # injection amount to zero
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
index 36a9494ded..6e77922745 100644
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -3,5 +3,7 @@
 # Used by:
 # Items from category: Charge (571 of 884)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
\ No newline at end of file
+    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py
index 30438b3f09..140baef43d 100644
--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -5,5 +5,7 @@
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)
diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/ammotrackingmultiplier.py
index 6dc7ab4bf4..0169f33d0a 100644
--- a/eos/effects/ammotrackingmultiplier.py
+++ b/eos/effects/ammotrackingmultiplier.py
@@ -9,5 +9,7 @@
 # Charges from group: Advanced Railgun Charge (8 of 8)
 # Charges from group: Projectile Ammo (129 of 129)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))
\ No newline at end of file
+    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))
diff --git a/eos/effects/angelsetbonus.py b/eos/effects/angelsetbonus.py
index 711d99c9d6..9057b5876d 100644
--- a/eos/effects/angelsetbonus.py
+++ b/eos/effects/angelsetbonus.py
@@ -4,8 +4,11 @@
 # Implants named like: grade Halo (18 of 18)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes,
+        lambda
+            implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes,
         "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))
\ No newline at end of file
+        implant.getModifiedItemAttr("implantSetAngel"))
diff --git a/eos/effects/antiwarpscramblingpassive.py b/eos/effects/antiwarpscramblingpassive.py
index 3318e13596..b6181e9a30 100644
--- a/eos/effects/antiwarpscramblingpassive.py
+++ b/eos/effects/antiwarpscramblingpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warmScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("warmScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/archaeologyskillvirusbonus.py b/eos/effects/archaeologyskillvirusbonus.py
index 3b4bf5a5df..9e383ba0aa 100644
--- a/eos/effects/archaeologyskillvirusbonus.py
+++ b/eos/effects/archaeologyskillvirusbonus.py
@@ -6,6 +6,8 @@
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Skill: Archaeology
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Archaeology"),
diff --git a/eos/effects/armorallrepairsystemsamountbonuspassive.py b/eos/effects/armorallrepairsystemsamountbonuspassive.py
index 18623844fb..c5162f3e0e 100644
--- a/eos/effects/armorallrepairsystemsamountbonuspassive.py
+++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py
@@ -4,6 +4,9 @@
 # Implants named like: Exile Booster (4 of 4)
 # Implant: Antipharmakon Kosybo
 type = "passive"
+
+
 def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
+        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))
diff --git a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
index f3a23f96fa..49def1be7d 100644
--- a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
+++ b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
diff --git a/eos/effects/armoredsquadroncommand.py b/eos/effects/armoredsquadroncommand.py
index ff55a0ff99..607009eb4c 100644
--- a/eos/effects/armoredsquadroncommand.py
+++ b/eos/effects/armoredsquadroncommand.py
@@ -4,6 +4,8 @@
 # Skill: Armored Warfare Specialist
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/armoredwarfaremindlink.py b/eos/effects/armoredwarfaremindlink.py
index bf0bdae839..78aed2b1d6 100644
--- a/eos/effects/armoredwarfaremindlink.py
+++ b/eos/effects/armoredwarfaremindlink.py
@@ -5,6 +5,8 @@
 # Implant: Federation Navy Warfare Mindlink
 # Implant: Imperial Navy Warfare Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
\ No newline at end of file
+                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/armorhpbonusadd.py b/eos/effects/armorhpbonusadd.py
index 51cbd88252..591e1cc58c 100644
--- a/eos/effects/armorhpbonusadd.py
+++ b/eos/effects/armorhpbonusadd.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Armor Reinforcer (48 of 48)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
diff --git a/eos/effects/armorhpbonusaddpassive.py b/eos/effects/armorhpbonusaddpassive.py
index d33d79e85b..0cce8f46ac 100644
--- a/eos/effects/armorhpbonusaddpassive.py
+++ b/eos/effects/armorhpbonusaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
diff --git a/eos/effects/armorhpmultiply.py b/eos/effects/armorhpmultiply.py
index 01aa236136..d9326eb73c 100644
--- a/eos/effects/armorhpmultiply.py
+++ b/eos/effects/armorhpmultiply.py
@@ -5,5 +5,7 @@
 # Modules from group: Armor Plating Energized (187 of 187)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py
index 7979016839..d61b0224cb 100644
--- a/eos/effects/armorreinforcermassadd.py
+++ b/eos/effects/armorreinforcermassadd.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Armor Reinforcer (48 of 48)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
diff --git a/eos/effects/armorrepair.py b/eos/effects/armorrepair.py
index 02239d8591..8555baec06 100644
--- a/eos/effects/armorrepair.py
+++ b/eos/effects/armorrepair.py
@@ -4,7 +4,9 @@
 # Modules from group: Armor Repair Unit (105 of 105)
 runTime = "late"
 type = "active"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("armorDamageAmount")
     speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("armorRepair", amount / speed)
\ No newline at end of file
+    fit.extraAttributes.increase("armorRepair", amount / speed)
diff --git a/eos/effects/armorrepairamountbonussubcap.py b/eos/effects/armorrepairamountbonussubcap.py
index 7899047883..e50b74ab9f 100644
--- a/eos/effects/armorrepairamountbonussubcap.py
+++ b/eos/effects/armorrepairamountbonussubcap.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Grade Asklepian (15 of 16)
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"))
diff --git a/eos/effects/armorrepairprojectorfalloffbonus.py b/eos/effects/armorrepairprojectorfalloffbonus.py
index b3cfc417d5..6fe69d3b47 100644
--- a/eos/effects/armorrepairprojectorfalloffbonus.py
+++ b/eos/effects/armorrepairprojectorfalloffbonus.py
@@ -7,6 +7,10 @@
 # Ship: Exequror
 # Ship: Inquisitor
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("falloffBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer",
+                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/armorrepairprojectormaxrangebonus.py b/eos/effects/armorrepairprojectormaxrangebonus.py
index c0629f2820..60f66763c9 100644
--- a/eos/effects/armorrepairprojectormaxrangebonus.py
+++ b/eos/effects/armorrepairprojectormaxrangebonus.py
@@ -7,6 +7,10 @@
 # Ship: Exequror
 # Ship: Inquisitor
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("maxRangeBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "maxRange",
+                                  src.getModifiedItemAttr("maxRangeBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer", "maxRange",
+                                  src.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/armortankinggang.py b/eos/effects/armortankinggang.py
index 02a22b2a5c..8258d46ea9 100644
--- a/eos/effects/armortankinggang.py
+++ b/eos/effects/armortankinggang.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "armorHP"
 gangBonus = "armorHpBonus"
+
+
 def handler(fit, skill, context):
     fit.ship.boostItemAttr(gangBoost, skill.getModifiedItemAttr(gangBonus) * skill.level)
diff --git a/eos/effects/armorupgradesmasspenaltyreductionbonus.py b/eos/effects/armorupgradesmasspenaltyreductionbonus.py
index 4f040c14f6..f7bfd67eed 100644
--- a/eos/effects/armorupgradesmasspenaltyreductionbonus.py
+++ b/eos/effects/armorupgradesmasspenaltyreductionbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Armor Layering
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer",
diff --git a/eos/effects/armorwarfarearmorhpreplacer.py b/eos/effects/armorwarfarearmorhpreplacer.py
index ffcf0efec3..12a52e8b9c 100644
--- a/eos/effects/armorwarfarearmorhpreplacer.py
+++ b/eos/effects/armorwarfarearmorhpreplacer.py
@@ -7,6 +7,9 @@
 type = "gang", "active"
 gangBonus = "armorHpBonus2"
 gangBoost = "armorHP"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("armorHpBonus2"))
diff --git a/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py b/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py
index a9c185dc72..965ade57d8 100644
--- a/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py
+++ b/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py
@@ -6,6 +6,8 @@
 # Skill: Astrogeology
 # Skill: Mining
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
diff --git a/eos/effects/basemaxscandeviationmodifiermoduleonline2none.py b/eos/effects/basemaxscandeviationmodifiermoduleonline2none.py
index 054c9296de..3169597ef1 100644
--- a/eos/effects/basemaxscandeviationmodifiermoduleonline2none.py
+++ b/eos/effects/basemaxscandeviationmodifiermoduleonline2none.py
@@ -3,7 +3,10 @@
 # Used by:
 # Variations of module: Scan Pinpointing Array I (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation", module.getModifiedItemAttr("maxScanDeviationModifierModule"),
+                                    "baseMaxScanDeviation",
+                                    module.getModifiedItemAttr("maxScanDeviationModifierModule"),
                                     stackingPenalties=True)
diff --git a/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py b/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py
index 2b7ce75140..81724b690f 100644
--- a/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py
+++ b/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py
@@ -5,7 +5,10 @@
 # Skill: Astrometric Pinpointing
 # Skill: Astrometrics
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation", container.getModifiedItemAttr("maxScanDeviationModifier") * level)
+                                    "baseMaxScanDeviation",
+                                    container.getModifiedItemAttr("maxScanDeviationModifier") * level)
diff --git a/eos/effects/basesensorstrengthmodifiermodule.py b/eos/effects/basesensorstrengthmodifiermodule.py
index 501a9f24b0..5d64ab13a2 100644
--- a/eos/effects/basesensorstrengthmodifiermodule.py
+++ b/eos/effects/basesensorstrengthmodifiermodule.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of module: Scan Rangefinding Array I (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
                                     "baseSensorStrength", module.getModifiedItemAttr("scanStrengthBonusModule"),
diff --git a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
index ae76823460..1c302d2617 100644
--- a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
+++ b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py
@@ -8,6 +8,8 @@
 # Skill: Astrometric Rangefinding
 # Skill: Astrometrics
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalized = False if "skill" in context or "implant" in context else True
diff --git a/eos/effects/battlecruiserdronespeed.py b/eos/effects/battlecruiserdronespeed.py
index 2ce3247eab..5d666f43a5 100644
--- a/eos/effects/battlecruiserdronespeed.py
+++ b/eos/effects/battlecruiserdronespeed.py
@@ -4,6 +4,8 @@
 # Ship: Myrmidon
 # Ship: Prophecy
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermetrange.py b/eos/effects/battlecruisermetrange.py
index ca3ec3e7c8..3d0e9e2aa9 100644
--- a/eos/effects/battlecruisermetrange.py
+++ b/eos/effects/battlecruisermetrange.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Harbinger (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermhtrange.py b/eos/effects/battlecruisermhtrange.py
index 6501a24053..268704d824 100644
--- a/eos/effects/battlecruisermhtrange.py
+++ b/eos/effects/battlecruisermhtrange.py
@@ -4,6 +4,8 @@
 # Ships named like: Brutix (2 of 2)
 # Ship: Ferox
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermissilerange.py b/eos/effects/battlecruisermissilerange.py
index 153f1bf2dd..a095cac39d 100644
--- a/eos/effects/battlecruisermissilerange.py
+++ b/eos/effects/battlecruisermissilerange.py
@@ -4,6 +4,8 @@
 # Ships named like: Drake (2 of 2)
 # Ship: Cyclone
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermptrange.py b/eos/effects/battlecruisermptrange.py
index 45c16ccd93..57f8ebe4a2 100644
--- a/eos/effects/battlecruisermptrange.py
+++ b/eos/effects/battlecruisermptrange.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Hurricane (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/bclargeenergyturretcapacitorneedbonus.py b/eos/effects/bclargeenergyturretcapacitorneedbonus.py
index 749c35b3da..a4e3036f3a 100644
--- a/eos/effects/bclargeenergyturretcapacitorneedbonus.py
+++ b/eos/effects/bclargeenergyturretcapacitorneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Oracle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                      "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/bclargeenergyturretcpuneedbonus.py b/eos/effects/bclargeenergyturretcpuneedbonus.py
index 3857a0099f..a59ed687ec 100644
--- a/eos/effects/bclargeenergyturretcpuneedbonus.py
+++ b/eos/effects/bclargeenergyturretcpuneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Oracle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                      "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/bclargeenergyturretpowerneedbonus.py b/eos/effects/bclargeenergyturretpowerneedbonus.py
index 6545952885..9bed34c1d2 100644
--- a/eos/effects/bclargeenergyturretpowerneedbonus.py
+++ b/eos/effects/bclargeenergyturretpowerneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Oracle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                      "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/bclargehybridturretcapacitorneedbonus.py b/eos/effects/bclargehybridturretcapacitorneedbonus.py
index b90fc0ca6c..04ea48c8fb 100644
--- a/eos/effects/bclargehybridturretcapacitorneedbonus.py
+++ b/eos/effects/bclargehybridturretcapacitorneedbonus.py
@@ -4,6 +4,8 @@
 # Ship: Naga
 # Ship: Talos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                      "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/bclargehybridturretcpuneedbonus.py b/eos/effects/bclargehybridturretcpuneedbonus.py
index f1974efcbd..299c318457 100644
--- a/eos/effects/bclargehybridturretcpuneedbonus.py
+++ b/eos/effects/bclargehybridturretcpuneedbonus.py
@@ -4,6 +4,8 @@
 # Ship: Naga
 # Ship: Talos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                      "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/bclargehybridturretpowerneedbonus.py b/eos/effects/bclargehybridturretpowerneedbonus.py
index 0f739843a2..c350728784 100644
--- a/eos/effects/bclargehybridturretpowerneedbonus.py
+++ b/eos/effects/bclargehybridturretpowerneedbonus.py
@@ -4,6 +4,8 @@
 # Ship: Naga
 # Ship: Talos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                      "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/bclargeprojectileturretcpuneedbonus.py b/eos/effects/bclargeprojectileturretcpuneedbonus.py
index e5d2db9de9..fc0dfc50a1 100644
--- a/eos/effects/bclargeprojectileturretcpuneedbonus.py
+++ b/eos/effects/bclargeprojectileturretcpuneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Tornado
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                      "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/bclargeprojectileturretpowerneedbonus.py b/eos/effects/bclargeprojectileturretpowerneedbonus.py
index 134e763904..c37e55b8f8 100644
--- a/eos/effects/bclargeprojectileturretpowerneedbonus.py
+++ b/eos/effects/bclargeprojectileturretpowerneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Tornado
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                      "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/biologytimebonusfixed.py b/eos/effects/biologytimebonusfixed.py
index 3e4b772174..b0e63322a6 100644
--- a/eos/effects/biologytimebonusfixed.py
+++ b/eos/effects/biologytimebonusfixed.py
@@ -4,6 +4,9 @@
 # Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
 # Skill: Biology
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.boosters.filteredItemBoost(lambda bst: True, "boosterDuration", container.getModifiedItemAttr("durationBonus") * level)
+    fit.boosters.filteredItemBoost(lambda bst: True, "boosterDuration",
+                                   container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/blockaderunnercloakcpupercentbonus.py b/eos/effects/blockaderunnercloakcpupercentbonus.py
index aaca38f6ae..b153efbc35 100644
--- a/eos/effects/blockaderunnercloakcpupercentbonus.py
+++ b/eos/effects/blockaderunnercloakcpupercentbonus.py
@@ -4,6 +4,9 @@
 # Ships from group: Blockade Runner (4 of 4)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"), skill="Transport Ships")
+                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"),
+                                  skill="Transport Ships")
diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
index 247ecae3e0..a77a9991de 100644
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))
diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py
index eaf28ae3e4..fc7efa1ee9 100644
--- a/eos/effects/boosterarmorrepairamountpenalty.py
+++ b/eos/effects/boosterarmorrepairamountpenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: Mindflood Booster (3 of 4)
 # Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
                                   "armorDamageAmount", booster.getModifiedItemAttr("boosterArmorRepairAmountPenalty"))
diff --git a/eos/effects/boostercapacitorcapacitypenalty.py b/eos/effects/boostercapacitorcapacitypenalty.py
index f48bce9387..a143244821 100644
--- a/eos/effects/boostercapacitorcapacitypenalty.py
+++ b/eos/effects/boostercapacitorcapacitypenalty.py
@@ -4,5 +4,7 @@
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr("boosterCapacitorCapacityPenalty"))
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
index 410f89c537..8de23ee0fa 100644
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
diff --git a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py
index be70ee93da..5c3758ccf3 100644
--- a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py
+++ b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py
@@ -4,6 +4,8 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "aoeCloudSize", booster.getModifiedItemAttr("boosterMissileAOECloudPenalty"))
diff --git a/eos/effects/boostermissileexplosionvelocitypenalty.py b/eos/effects/boostermissileexplosionvelocitypenalty.py
index d61092b1ae..62a5d9d0af 100644
--- a/eos/effects/boostermissileexplosionvelocitypenalty.py
+++ b/eos/effects/boostermissileexplosionvelocitypenalty.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "aoeVelocity", booster.getModifiedItemAttr("boosterAOEVelocityPenalty"))
diff --git a/eos/effects/boostermissilevelocitypenalty.py b/eos/effects/boostermissilevelocitypenalty.py
index c3fc28fe7f..0fbb3ec22e 100644
--- a/eos/effects/boostermissilevelocitypenalty.py
+++ b/eos/effects/boostermissilevelocitypenalty.py
@@ -4,6 +4,8 @@
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", "boosterMissileVelocityPenalty")
diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py
index a5c0653cac..a8b30251b7 100644
--- a/eos/effects/boostermodifyboosterarmorpenalties.py
+++ b/eos/effects/boostermodifyboosterarmorpenalties.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     attrs = ("boosterArmorHPPenalty", "boosterArmorRepairAmountPenalty")
diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
index 702557a971..348cd192bf 100644
--- a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
+++ b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     attrs = ("boosterCapacitorCapacityPenalty", "boosterMaxVelocityPenalty")
diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/boostermodifyboostermissilepenalty.py
index 2dbb030bbf..0c247422d3 100644
--- a/eos/effects/boostermodifyboostermissilepenalty.py
+++ b/eos/effects/boostermodifyboostermissilepenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     attrs = ("boosterAOEVelocityPenalty", "boosterMissileAOECloudPenalty", "boosterMissileVelocityPenalty")
diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/boostermodifyboostershieldpenalty.py
index cbbfe8b6ea..9e05f2cb0f 100644
--- a/eos/effects/boostermodifyboostershieldpenalty.py
+++ b/eos/effects/boostermodifyboostershieldpenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     attrs = ("boosterShieldBoostAmountPenalty", "boosterShieldCapacityPenalty", "shieldBoostMultiplier")
diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/boostermodifyboosterturretpenalty.py
index b0303b63ec..c855a84e49 100644
--- a/eos/effects/boostermodifyboosterturretpenalty.py
+++ b/eos/effects/boostermodifyboosterturretpenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRange", "boosterTurretTrackingPenalty")
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index 690ec5b82f..2e6f057319 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
diff --git a/eos/effects/boosterturretfalloffpenalty.py b/eos/effects/boosterturretfalloffpenalty.py
index 3a57f1f6e5..44576795bb 100644
--- a/eos/effects/boosterturretfalloffpenalty.py
+++ b/eos/effects/boosterturretfalloffpenalty.py
@@ -4,6 +4,8 @@
 # Implants named like: Drop Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "falloff", booster.getModifiedItemAttr("boosterTurretFalloffPenalty"))
diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py
index cc9fd92247..216f2d44f2 100644
--- a/eos/effects/boosterturretoptimalrangepenalty.py
+++ b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -5,6 +5,8 @@
 # Implants named like: Mindflood Booster (3 of 4)
 # Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "maxRange", booster.getModifiedItemAttr("boosterTurretOptimalRange"))
diff --git a/eos/effects/boosterturrettrackingpenalty.py b/eos/effects/boosterturrettrackingpenalty.py
index dc7b852b3c..71f0627ffa 100644
--- a/eos/effects/boosterturrettrackingpenalty.py
+++ b/eos/effects/boosterturrettrackingpenalty.py
@@ -4,6 +4,8 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Frentix Booster (3 of 4)
 type = "boosterSideEffect"
+
+
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "trackingSpeed", booster.getModifiedItemAttr("boosterTurretTrackingPenalty"))
diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/caldarisetbonus3.py
index a31e831e68..ee4d55f4b0 100644
--- a/eos/effects/caldarisetbonus3.py
+++ b/eos/effects/caldarisetbonus3.py
@@ -4,6 +4,9 @@
 # Implants named like: High grade Talon (6 of 6)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy"))
+                                             "scanGravimetricStrengthPercent",
+                                             implant.getModifiedItemAttr("implantSetCaldariNavy"))
diff --git a/eos/effects/caldarisetlgbonus.py b/eos/effects/caldarisetlgbonus.py
index 04d1c6f746..ed684aa942 100644
--- a/eos/effects/caldarisetlgbonus.py
+++ b/eos/effects/caldarisetlgbonus.py
@@ -4,6 +4,9 @@
 # Implants named like: Low grade Talon (6 of 6)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
+                                             "scanGravimetricStrengthModifier",
+                                             implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
diff --git a/eos/effects/caldarishipecmburstoptimalrangecb3.py b/eos/effects/caldarishipecmburstoptimalrangecb3.py
index 5025deba54..cc2d38e7aa 100644
--- a/eos/effects/caldarishipecmburstoptimalrangecb3.py
+++ b/eos/effects/caldarishipecmburstoptimalrangecb3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scorpion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
                                   "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/caldarishipewcapacitorneedcc.py b/eos/effects/caldarishipewcapacitorneedcc.py
index 9224e27280..05a33ec438 100644
--- a/eos/effects/caldarishipewcapacitorneedcc.py
+++ b/eos/effects/caldarishipewcapacitorneedcc.py
@@ -5,6 +5,8 @@
 # Ship: Falcon
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/caldarishipewcapacitorneedcf2.py b/eos/effects/caldarishipewcapacitorneedcf2.py
index 4f90135ab1..3a63615dd2 100644
--- a/eos/effects/caldarishipewcapacitorneedcf2.py
+++ b/eos/effects/caldarishipewcapacitorneedcf2.py
@@ -4,6 +4,8 @@
 # Ship: Griffin
 # Ship: Kitsune
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/caldarishipewfalloffrangecb3.py b/eos/effects/caldarishipewfalloffrangecb3.py
index 53a325271b..6e17fdbe11 100644
--- a/eos/effects/caldarishipewfalloffrangecb3.py
+++ b/eos/effects/caldarishipewfalloffrangecb3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scorpion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"),
+                                  skill="Caldari Battleship")
diff --git a/eos/effects/caldarishipewfalloffrangecc2.py b/eos/effects/caldarishipewfalloffrangecc2.py
index 33edac0247..d046a9c671 100644
--- a/eos/effects/caldarishipewfalloffrangecc2.py
+++ b/eos/effects/caldarishipewfalloffrangecc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Blackbird
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"),
+                                  skill="Caldari Cruiser")
diff --git a/eos/effects/caldarishipewoptimalrangecb3.py b/eos/effects/caldarishipewoptimalrangecb3.py
index 53794d2679..f595eed45c 100644
--- a/eos/effects/caldarishipewoptimalrangecb3.py
+++ b/eos/effects/caldarishipewoptimalrangecb3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scorpion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/caldarishipewoptimalrangecc2.py b/eos/effects/caldarishipewoptimalrangecc2.py
index d6e8b850ea..0c0362a852 100644
--- a/eos/effects/caldarishipewoptimalrangecc2.py
+++ b/eos/effects/caldarishipewoptimalrangecc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Blackbird
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/capacitorcapacityaddpassive.py b/eos/effects/capacitorcapacityaddpassive.py
index 0a311520fc..6f19332e74 100644
--- a/eos/effects/capacitorcapacityaddpassive.py
+++ b/eos/effects/capacitorcapacityaddpassive.py
@@ -4,6 +4,8 @@
 # Subsystems from group: Engineering Systems (16 of 16)
 # Subsystem: Tengu Offensive - Magnetic Infusion Basin
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("capacitorCapacity",
                               module.getModifiedItemAttr("capacitorCapacity"))
diff --git a/eos/effects/capacitorcapacitybonus.py b/eos/effects/capacitorcapacitybonus.py
index 69fd71ab7c..f2c0632da2 100644
--- a/eos/effects/capacitorcapacitybonus.py
+++ b/eos/effects/capacitorcapacitybonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Capacitor Battery (27 of 27)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py
index 415fe4abec..e01baf7607 100644
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -7,5 +7,7 @@
 # Modules from group: Propulsion Module (127 of 127)
 # Modules from group: Reactor Control Unit (22 of 22)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier"))
diff --git a/eos/effects/capacitoremissionsystemskill.py b/eos/effects/capacitoremissionsystemskill.py
index ba10bac90b..c792ef48c0 100644
--- a/eos/effects/capacitoremissionsystemskill.py
+++ b/eos/effects/capacitoremissionsystemskill.py
@@ -5,6 +5,8 @@
 # Modules named like: Egress Port Maximizer (8 of 8)
 # Skill: Capacitor Emission Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
diff --git a/eos/effects/capacityaddpassive.py b/eos/effects/capacityaddpassive.py
index 3078664606..01d74f1131 100644
--- a/eos/effects/capacityaddpassive.py
+++ b/eos/effects/capacityaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, subsystem, context):
     fit.ship.increaseItemAttr("capacity", subsystem.getModifiedItemAttr("capacity") or 0)
diff --git a/eos/effects/capitallauncherskillcitadelemdamage.py b/eos/effects/capitallauncherskillcitadelemdamage.py
index d36dc2786c..253fbd8189 100644
--- a/eos/effects/capitallauncherskillcitadelemdamage.py
+++ b/eos/effects/capitallauncherskillcitadelemdamage.py
@@ -4,6 +4,8 @@
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: XL Torpedoes
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
diff --git a/eos/effects/capitallauncherskillcitadelexplosivedamage.py b/eos/effects/capitallauncherskillcitadelexplosivedamage.py
index 42afaf2c31..1ce75bd0b4 100644
--- a/eos/effects/capitallauncherskillcitadelexplosivedamage.py
+++ b/eos/effects/capitallauncherskillcitadelexplosivedamage.py
@@ -4,6 +4,8 @@
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: XL Torpedoes
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
diff --git a/eos/effects/capitallauncherskillcitadelkineticdamage.py b/eos/effects/capitallauncherskillcitadelkineticdamage.py
index cffdb9adf2..9e59f3aead 100644
--- a/eos/effects/capitallauncherskillcitadelkineticdamage.py
+++ b/eos/effects/capitallauncherskillcitadelkineticdamage.py
@@ -4,6 +4,8 @@
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: XL Torpedoes
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
diff --git a/eos/effects/capitallauncherskillcitadelthermaldamage.py b/eos/effects/capitallauncherskillcitadelthermaldamage.py
index eb288a00b2..044c7a8441 100644
--- a/eos/effects/capitallauncherskillcitadelthermaldamage.py
+++ b/eos/effects/capitallauncherskillcitadelthermaldamage.py
@@ -4,6 +4,8 @@
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
 # Skill: XL Torpedoes
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
diff --git a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py b/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
index de758b0f06..2c847d0c18 100644
--- a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: XL Cruise Missiles
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py b/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
index e11517a1bc..2b52bfcb37 100644
--- a/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: XL Cruise Missiles
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py b/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
index f5c8f193c0..e51cad2506 100644
--- a/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: XL Cruise Missiles
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py b/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
index c0795f5878..097a6d2b23 100644
--- a/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: XL Cruise Missiles
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitalremotearmorrepairercapneedbonusskill.py b/eos/effects/capitalremotearmorrepairercapneedbonusskill.py
index a3b227d9ea..502143ed2a 100644
--- a/eos/effects/capitalremotearmorrepairercapneedbonusskill.py
+++ b/eos/effects/capitalremotearmorrepairercapneedbonusskill.py
@@ -4,6 +4,8 @@
 # Variations of module: Capital Remote Repair Augmentor I (2 of 2)
 # Skill: Capital Remote Armor Repair Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
diff --git a/eos/effects/capitalremoteenergytransfercapneedbonusskill.py b/eos/effects/capitalremoteenergytransfercapneedbonusskill.py
index ecbc402aec..a33d1250d7 100644
--- a/eos/effects/capitalremoteenergytransfercapneedbonusskill.py
+++ b/eos/effects/capitalremoteenergytransfercapneedbonusskill.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Capacitor Emission Systems
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
\ No newline at end of file
+                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/capitalremoteshieldtransfercapneedbonusskill.py b/eos/effects/capitalremoteshieldtransfercapneedbonusskill.py
index 440a9affff..7ae9b37107 100644
--- a/eos/effects/capitalremoteshieldtransfercapneedbonusskill.py
+++ b/eos/effects/capitalremoteshieldtransfercapneedbonusskill.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Shield Emission Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
diff --git a/eos/effects/capitalrepairsystemsskilldurationbonus.py b/eos/effects/capitalrepairsystemsskilldurationbonus.py
index 4106b9e549..9ccf424871 100644
--- a/eos/effects/capitalrepairsystemsskilldurationbonus.py
+++ b/eos/effects/capitalrepairsystemsskilldurationbonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Nanobot Accelerator (8 of 8)
 # Skill: Capital Repair Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "duration", container.getModifiedItemAttr("durationSkillBonus") * level,
-                                  stackingPenalties = "skill" not in context)
+                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py b/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py
index f405705114..82b5f1cde6 100644
--- a/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py
+++ b/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Core Defense Capacitor Safeguard (8 of 8)
 # Skill: Capital Shield Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
diff --git a/eos/effects/capitalturretskillhybriddamage.py b/eos/effects/capitalturretskillhybriddamage.py
index d4775be0ca..dac86333ae 100644
--- a/eos/effects/capitalturretskillhybriddamage.py
+++ b/eos/effects/capitalturretskillhybriddamage.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Hybrid Turret
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitalturretskilllaserdamage.py b/eos/effects/capitalturretskilllaserdamage.py
index dfe0f6b235..e1668e7c88 100644
--- a/eos/effects/capitalturretskilllaserdamage.py
+++ b/eos/effects/capitalturretskilllaserdamage.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Energy Turret
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capitalturretskillprojectiledamage.py b/eos/effects/capitalturretskillprojectiledamage.py
index 15f0e4b7de..ac4b491156 100644
--- a/eos/effects/capitalturretskillprojectiledamage.py
+++ b/eos/effects/capitalturretskillprojectiledamage.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Projectile Turret
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/capneedbonuseffecthybrids.py b/eos/effects/capneedbonuseffecthybrids.py
index 870621220e..8f1cad753f 100644
--- a/eos/effects/capneedbonuseffecthybrids.py
+++ b/eos/effects/capneedbonuseffecthybrids.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Hybrid Discharge Elutriation (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
\ No newline at end of file
+                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/capneedbonuseffectlasers.py b/eos/effects/capneedbonuseffectlasers.py
index ba8a8e47e5..e37290e634 100644
--- a/eos/effects/capneedbonuseffectlasers.py
+++ b/eos/effects/capneedbonuseffectlasers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Energy Discharge Elutriation (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
                                   "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/cargocapacitymultiply.py b/eos/effects/cargocapacitymultiply.py
index c476f9b79e..860f4c413a 100644
--- a/eos/effects/cargocapacitymultiply.py
+++ b/eos/effects/cargocapacitymultiply.py
@@ -5,5 +5,7 @@
 # Modules from group: Overdrive Injector System (7 of 7)
 # Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityMultiplier"))
diff --git a/eos/effects/carrieramarrarmorenergytransferrange3.py b/eos/effects/carrieramarrarmorenergytransferrange3.py
index f6d2b174a5..a7d18a697c 100644
--- a/eos/effects/carrieramarrarmorenergytransferrange3.py
+++ b/eos/effects/carrieramarrarmorenergytransferrange3.py
@@ -4,6 +4,8 @@
 # Ship: Aeon
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
diff --git a/eos/effects/carrieramarrarmorresist2.py b/eos/effects/carrieramarrarmorresist2.py
index c4ff2e9dd6..c6b8781f99 100644
--- a/eos/effects/carrieramarrarmorresist2.py
+++ b/eos/effects/carrieramarrarmorresist2.py
@@ -4,6 +4,8 @@
 # Ship: Aeon
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, ship, context):
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(resType),
diff --git a/eos/effects/carrieramarrarmortransferfalloff3.py b/eos/effects/carrieramarrarmortransferfalloff3.py
index 577fc749bb..86308a94ae 100644
--- a/eos/effects/carrieramarrarmortransferfalloff3.py
+++ b/eos/effects/carrieramarrarmortransferfalloff3.py
@@ -4,5 +4,9 @@
 # Ship: Aeon
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"),
+                                  skill="Amarr Carrier")
diff --git a/eos/effects/carrieramarrdronemax1.py b/eos/effects/carrieramarrdronemax1.py
index 0908e0cf60..a47aeb0957 100644
--- a/eos/effects/carrieramarrdronemax1.py
+++ b/eos/effects/carrieramarrdronemax1.py
@@ -4,5 +4,8 @@
 # Ship: Aeon
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierAmarrBonus1"), skill="Amarr Carrier")
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierAmarrBonus1"),
+                                 skill="Amarr Carrier")
diff --git a/eos/effects/carrieramarrfighterbombermaxvelocity2.py b/eos/effects/carrieramarrfighterbombermaxvelocity2.py
index 8a3a49b7a7..1670bdff43 100644
--- a/eos/effects/carrieramarrfighterbombermaxvelocity2.py
+++ b/eos/effects/carrieramarrfighterbombermaxvelocity2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
                                  "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")
diff --git a/eos/effects/carrieramarrfightermaxvelocity2.py b/eos/effects/carrieramarrfightermaxvelocity2.py
index 085ddf5083..4553a26a8c 100644
--- a/eos/effects/carrieramarrfightermaxvelocity2.py
+++ b/eos/effects/carrieramarrfightermaxvelocity2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
                                  "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")
diff --git a/eos/effects/carrieramarrleadershipmaxgroupactive4.py b/eos/effects/carrieramarrleadershipmaxgroupactive4.py
index 6b46d82a58..4695fa56c1 100644
--- a/eos/effects/carrieramarrleadershipmaxgroupactive4.py
+++ b/eos/effects/carrieramarrleadershipmaxgroupactive4.py
@@ -4,6 +4,9 @@
 # Ship: Aeon
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4"), skill="Amarr Carrier")
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4"),
+                                     skill="Amarr Carrier")
diff --git a/eos/effects/carriercaldaridronemax1.py b/eos/effects/carriercaldaridronemax1.py
index aa9f9f69ae..cf0bbc674b 100644
--- a/eos/effects/carriercaldaridronemax1.py
+++ b/eos/effects/carriercaldaridronemax1.py
@@ -4,5 +4,8 @@
 # Ship: Chimera
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierCaldariBonus1"),
+                                 skill="Caldari Carrier")
diff --git a/eos/effects/carriercaldarifightersandbomberssig1.py b/eos/effects/carriercaldarifightersandbomberssig1.py
index 3602e72e75..3aaba55fd3 100644
--- a/eos/effects/carriercaldarifightersandbomberssig1.py
+++ b/eos/effects/carriercaldarifightersandbomberssig1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters") or drone.item.requiresSkill("Fighter Bombers"),
-                                 "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")
+    fit.drones.filteredItemBoost(
+        lambda drone: drone.item.requiresSkill("Fighters") or drone.item.requiresSkill("Fighter Bombers"),
+        "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")
diff --git a/eos/effects/carriercaldarileadershipmaxgroupactive4.py b/eos/effects/carriercaldarileadershipmaxgroupactive4.py
index 118bef11da..ec353fc853 100644
--- a/eos/effects/carriercaldarileadershipmaxgroupactive4.py
+++ b/eos/effects/carriercaldarileadershipmaxgroupactive4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4"), skill="Caldari Carrier")
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4"),
+                                     skill="Caldari Carrier")
diff --git a/eos/effects/carriercaldarishieldenergytransferrange3.py b/eos/effects/carriercaldarishieldenergytransferrange3.py
index 129c929162..760ab1a9ca 100644
--- a/eos/effects/carriercaldarishieldenergytransferrange3.py
+++ b/eos/effects/carriercaldarishieldenergytransferrange3.py
@@ -5,6 +5,8 @@
 # Ship: Revenant
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
diff --git a/eos/effects/carriercaldarishieldresist2.py b/eos/effects/carriercaldarishieldresist2.py
index 29e4de20a9..3faa2cdf44 100644
--- a/eos/effects/carriercaldarishieldresist2.py
+++ b/eos/effects/carriercaldarishieldresist2.py
@@ -4,6 +4,8 @@
 # Ship: Chimera
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, ship, context):
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("shield{0}DamageResonance".format(resType),
diff --git a/eos/effects/carriercaldarishieldtransferfalloff3.py b/eos/effects/carriercaldarishieldtransferfalloff3.py
index 301407707a..0574cc1ca3 100644
--- a/eos/effects/carriercaldarishieldtransferfalloff3.py
+++ b/eos/effects/carriercaldarishieldtransferfalloff3.py
@@ -5,5 +5,9 @@
 # Ship: Revenant
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"),
+                                  skill="Caldari Carrier")
diff --git a/eos/effects/carrierfightercontrolrangebonus.py b/eos/effects/carrierfightercontrolrangebonus.py
index 1dd44673d2..1981c1f0f9 100644
--- a/eos/effects/carrierfightercontrolrangebonus.py
+++ b/eos/effects/carrierfightercontrolrangebonus.py
@@ -4,6 +4,8 @@
 # Ships from group: Carrier (4 of 4)
 # Ships from group: Supercarrier (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     # The fighter control range bonus only affects fighters.
     # Until we can calculate and display control range on a per-drone level,
diff --git a/eos/effects/carriergallentearmorshieldtransferfalloff3.py b/eos/effects/carriergallentearmorshieldtransferfalloff3.py
index 2f3a5fd55f..170ab6cdf6 100644
--- a/eos/effects/carriergallentearmorshieldtransferfalloff3.py
+++ b/eos/effects/carriergallentearmorshieldtransferfalloff3.py
@@ -4,5 +4,10 @@
 # Ship: Nyx
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
\ No newline at end of file
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill(
+            "Capital Remote Armor Repair Systems"), "falloffEffectiveness",
+        src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
diff --git a/eos/effects/carriergallentearmorshieldtransferrange3.py b/eos/effects/carriergallentearmorshieldtransferrange3.py
index 62cae37b74..d07cbaa9f7 100644
--- a/eos/effects/carriergallentearmorshieldtransferrange3.py
+++ b/eos/effects/carriergallentearmorshieldtransferrange3.py
@@ -4,8 +4,12 @@
 # Ship: Nyx
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
+                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"),
+                                  skill="Gallente Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
+                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"),
+                                  skill="Gallente Carrier")
diff --git a/eos/effects/carriergallentebomberdroneowndmg2.py b/eos/effects/carriergallentebomberdroneowndmg2.py
index 3dafc54f86..bc6648e23b 100644
--- a/eos/effects/carriergallentebomberdroneowndmg2.py
+++ b/eos/effects/carriergallentebomberdroneowndmg2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"),
+                                 skill="Gallente Carrier")
diff --git a/eos/effects/carriergallentedronemax1.py b/eos/effects/carriergallentedronemax1.py
index 8f05ba0be2..1b8249dcb1 100644
--- a/eos/effects/carriergallentedronemax1.py
+++ b/eos/effects/carriergallentedronemax1.py
@@ -4,5 +4,8 @@
 # Ship: Nyx
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierGallenteBonus1"), skill="Gallente Carrier")
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierGallenteBonus1"),
+                                 skill="Gallente Carrier")
diff --git a/eos/effects/carriergallentedroneowndmg2.py b/eos/effects/carriergallentedroneowndmg2.py
index a9fcc279bc..09927080da 100644
--- a/eos/effects/carriergallentedroneowndmg2.py
+++ b/eos/effects/carriergallentedroneowndmg2.py
@@ -4,6 +4,9 @@
 # Ship: Nyx
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"),
+                                 skill="Gallente Carrier")
diff --git a/eos/effects/carriergallenteleadershipmaxgroupactive4.py b/eos/effects/carriergallenteleadershipmaxgroupactive4.py
index a82ea857d3..8ba75aabad 100644
--- a/eos/effects/carriergallenteleadershipmaxgroupactive4.py
+++ b/eos/effects/carriergallenteleadershipmaxgroupactive4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4"), skill="Gallente Carrier")
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4"),
+                                     skill="Gallente Carrier")
diff --git a/eos/effects/carrierminmatararmorshieldamount.py b/eos/effects/carrierminmatararmorshieldamount.py
index b8a5fbfb30..27685714d2 100644
--- a/eos/effects/carrierminmatararmorshieldamount.py
+++ b/eos/effects/carrierminmatararmorshieldamount.py
@@ -4,8 +4,12 @@
 # Ship: Hel
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")
+                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2"),
+                                  skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2"),
+                                  skill="Minmatar Carrier")
diff --git a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
index 27eb623c12..6aaaaa1bdc 100644
--- a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
+++ b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
@@ -4,5 +4,10 @@
 # Ship: Hel
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill(
+            "Capital Remote Armor Repair Systems"), "falloffEffectiveness",
+        src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
diff --git a/eos/effects/carrierminmatararmorshieldtransferrange3.py b/eos/effects/carrierminmatararmorshieldtransferrange3.py
index bb394afbbd..7b96affe58 100644
--- a/eos/effects/carrierminmatararmorshieldtransferrange3.py
+++ b/eos/effects/carrierminmatararmorshieldtransferrange3.py
@@ -4,8 +4,12 @@
 # Ship: Hel
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
+                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"),
+                                  skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
+                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"),
+                                  skill="Minmatar Carrier")
diff --git a/eos/effects/carrierminmatardronemax1.py b/eos/effects/carrierminmatardronemax1.py
index 58e3e69176..a8d9a65fa6 100644
--- a/eos/effects/carrierminmatardronemax1.py
+++ b/eos/effects/carrierminmatardronemax1.py
@@ -4,5 +4,8 @@
 # Ship: Hel
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierMinmatarBonus1"), skill="Minmatar Carrier")
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierMinmatarBonus1"),
+                                 skill="Minmatar Carrier")
diff --git a/eos/effects/carrierminmatarleadershipmaxgroupactive4.py b/eos/effects/carrierminmatarleadershipmaxgroupactive4.py
index 449cc1bd37..8f169906fc 100644
--- a/eos/effects/carrierminmatarleadershipmaxgroupactive4.py
+++ b/eos/effects/carrierminmatarleadershipmaxgroupactive4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4"), skill="Minmatar Carrier")
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4"),
+                                     skill="Minmatar Carrier")
diff --git a/eos/effects/cloaking.py b/eos/effects/cloaking.py
index e7789d64d4..258dbc5556 100644
--- a/eos/effects/cloaking.py
+++ b/eos/effects/cloaking.py
@@ -4,7 +4,9 @@
 # Modules from group: Cloaking Device (10 of 14)
 type = "active"
 runTime = "early"
-#TODO: Rewrite this effect
+
+
+# TODO: Rewrite this effect
 def handler(fit, module, context):
     # Set flag which is used to determine if ship is cloaked or not
     # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
diff --git a/eos/effects/cloakingprototype.py b/eos/effects/cloakingprototype.py
index 9e7c65c172..64993f9bb1 100644
--- a/eos/effects/cloakingprototype.py
+++ b/eos/effects/cloakingprototype.py
@@ -4,7 +4,9 @@
 # Modules named like: Prototype Cloaking Device I (2 of 2)
 type = "active"
 runTime = "early"
-#TODO: Rewrite this effect
+
+
+# TODO: Rewrite this effect
 def handler(fit, module, context):
     # Set flag which is used to determine if ship is cloaked or not
     # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
diff --git a/eos/effects/cloakingscanresolutionmultiplier.py b/eos/effects/cloakingscanresolutionmultiplier.py
index b602d627de..38f073c5bd 100644
--- a/eos/effects/cloakingscanresolutionmultiplier.py
+++ b/eos/effects/cloakingscanresolutionmultiplier.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Cloaking Device (12 of 14)
 type = "offline"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanResolution",
                               module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties = True, penaltyGroup="cloakingScanResolutionMultiplier")
+                              stackingPenalties=True, penaltyGroup="cloakingScanResolutionMultiplier")
diff --git a/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py b/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py
index 369ea858a1..40d80376ed 100644
--- a/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py
+++ b/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Targeting Systems Stabilizer (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Cloaking"),
                                   "cloakingTargetingDelay", module.getModifiedItemAttr("cloakingTargetingDelayBonus"))
diff --git a/eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py b/eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py
index 4ee8deb743..292926bdd9 100644
--- a/eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py
+++ b/eos/effects/cloakingtargetingdelaybonuspostpercentcloakingtargetingdelaybonusforshipmodulesrequiringcloaking.py
@@ -3,7 +3,9 @@
 # Used by:
 # Skill: Cloaking
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
                                   "cloakingTargetingDelay",
-                                  skill.getModifiedItemAttr("cloakingTargetingDelayBonus") * skill.level)
\ No newline at end of file
+                                  skill.getModifiedItemAttr("cloakingTargetingDelayBonus") * skill.level)
diff --git a/eos/effects/cloakingwarpsafe.py b/eos/effects/cloakingwarpsafe.py
index 1af531b2c4..6906118dc0 100644
--- a/eos/effects/cloakingwarpsafe.py
+++ b/eos/effects/cloakingwarpsafe.py
@@ -4,6 +4,8 @@
 # Modules named like: Covert Ops Cloaking Device II (2 of 2)
 type = "active"
 runTime = "early"
+
+
 def handler(fit, ship, context):
     fit.extraAttributes["cloaked"] = True
-    #TODO: Implement
\ No newline at end of file
+    # TODO: Implement
diff --git a/eos/effects/clonevatmaxjumpclonebonusskillnew.py b/eos/effects/clonevatmaxjumpclonebonusskillnew.py
index 2131a71f31..0ab64f55ee 100644
--- a/eos/effects/clonevatmaxjumpclonebonusskillnew.py
+++ b/eos/effects/clonevatmaxjumpclonebonusskillnew.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Cloning Facility Operation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.boostItemAttr("maxJumpClones", skill.getModifiedItemAttr("maxJumpClonesBonus") * skill.level)
diff --git a/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py b/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
index 0f0101a668..9b3ef297ce 100644
--- a/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonusecmmultiplywithcommandbonushidden.py
@@ -5,10 +5,13 @@
 gangBonus = "commandBonusECM"
 gangBoost = "ewarStrECM"
 type = "active", "gang"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for scanType in ("Magnetometric", "Radar", "Ladar", "Gravimetric"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronic Warfare"),
                                       "scan%sStrengthBonus" % scanType,
                                       module.getModifiedItemAttr("commandBonusECM"),
-                                      stackingPenalties = True)
+                                      stackingPenalties=True)
diff --git a/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py b/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
index 9080637fdb..dfc9a123d5 100644
--- a/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py
@@ -5,8 +5,11 @@
 gangBonus = "commandBonusRSD"
 gangBoost = "ewarStrRSD"
 type = "active", "gang"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
                                   "maxTargetRangeBonus", module.getModifiedItemAttr("commandBonusRSD"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
diff --git a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py
index 11987a66bb..64c792f9f0 100644
--- a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py
@@ -5,16 +5,19 @@
 gangBonus = "commandBonusTD"
 gangBoost = "ewarStrTD"
 type = "active", "gang"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for bonus in (
-        "missileVelocityBonus",
-        "explosionDelayBonus",
-        "aoeVelocityBonus",
-        "falloffBonus",
-        "maxRangeBonus",
-        "aoeCloudSizeBonus",
-        "trackingSpeedBonus"
+            "missileVelocityBonus",
+            "explosionDelayBonus",
+            "aoeVelocityBonus",
+            "falloffBonus",
+            "maxRangeBonus",
+            "aoeCloudSizeBonus",
+            "trackingSpeedBonus"
     ):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                       bonus, module.getModifiedItemAttr("commandBonusTD"))
diff --git a/eos/effects/commandbonustpmultiplywithcommandbonushidden.py b/eos/effects/commandbonustpmultiplywithcommandbonushidden.py
index f3ae016987..9778289eb6 100644
--- a/eos/effects/commandbonustpmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonustpmultiplywithcommandbonushidden.py
@@ -5,8 +5,11 @@
 gangBonus = "commandBonusTP"
 gangBoost = "ewarStrTP"
 type = "active", "gang"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
                                   "signatureRadiusBonus", module.getModifiedItemAttr("commandBonusTP"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/commandshipmultirelayeffect.py b/eos/effects/commandshipmultirelayeffect.py
index 427bfe38ea..e72671ddd2 100644
--- a/eos/effects/commandshipmultirelayeffect.py
+++ b/eos/effects/commandshipmultirelayeffect.py
@@ -5,6 +5,8 @@
 # Ship: Orca
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
                                      "maxGroupActive", ship.getModifiedItemAttr("maxGangModules"))
diff --git a/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py b/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py
index 1796796d72..7c1cd70119 100644
--- a/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py
@@ -4,6 +4,8 @@
 # Implants named like: Inherent Implants 'Lancer' Controlled Bursts CB (6 of 6)
 # Skill: Controlled Bursts
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/covertcloakcpuaddition.py b/eos/effects/covertcloakcpuaddition.py
index b827d61831..c3aa76e175 100644
--- a/eos/effects/covertcloakcpuaddition.py
+++ b/eos/effects/covertcloakcpuaddition.py
@@ -4,5 +4,7 @@
 # Modules named like: Covert Ops Cloaking Device II (2 of 2)
 # Module: Covert Cynosural Field Generator I
 type = "passive"
+
+
 def handler(fit, module, context):
     module.increaseItemAttr("cpu", module.getModifiedItemAttr("covertCloakCPUAdd") or 0)
diff --git a/eos/effects/covertcynocpupenalty.py b/eos/effects/covertcynocpupenalty.py
index 14fdcd33ae..193ade4ea9 100644
--- a/eos/effects/covertcynocpupenalty.py
+++ b/eos/effects/covertcynocpupenalty.py
@@ -3,7 +3,8 @@
 # Used by:
 # Subsystems from group: Offensive Systems (12 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cynosural Field Theory"),
                                      "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
-
diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
index 9b293787d1..3d583a770c 100644
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -11,6 +11,9 @@
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "moduleReactivationDelay", container.getModifiedItemAttr("covertOpsAndReconOpsCloakModuleDelay"))
+                                  "moduleReactivationDelay",
+                                  container.getModifiedItemAttr("covertOpsAndReconOpsCloakModuleDelay"))
diff --git a/eos/effects/covertopscloakcpupenalty.py b/eos/effects/covertopscloakcpupenalty.py
index 7b5ce919f3..6ac6c81d3b 100644
--- a/eos/effects/covertopscloakcpupenalty.py
+++ b/eos/effects/covertopscloakcpupenalty.py
@@ -3,7 +3,8 @@
 # Used by:
 # Subsystems from group: Offensive Systems (12 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cloaking"),
                                      "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
-
diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/covertopscloakcpupercentbonus1.py
index 534a50a384..44b78ca688 100644
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -4,6 +4,8 @@
 # Ships from group: Covert Ops (5 of 5)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
                                   "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
diff --git a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
index b4472ad845..6feae8252f 100644
--- a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
+++ b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
@@ -6,6 +6,8 @@
 # Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
                                   "cpu", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/covertopscpubonus1.py b/eos/effects/covertopscpubonus1.py
index bf0ae980aa..31b5c3fcec 100644
--- a/eos/effects/covertopscpubonus1.py
+++ b/eos/effects/covertopscpubonus1.py
@@ -4,6 +4,8 @@
 # Ships from group: Stealth Bomber (4 of 4)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Cloaking Device",
                                      "cpu", container.getModifiedItemAttr("cloakingCpuNeedBonus"))
diff --git a/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py b/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py
index 9ceada617c..9f65b698af 100644
--- a/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py
+++ b/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Stealth Bomber (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
                                      "power", ship.getModifiedItemAttr("stealthBomberLauncherPower"))
diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
index 04e246ac1e..d24d888747 100644
--- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py
+++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
@@ -7,6 +7,9 @@
 # Ship: Endurance
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cloakingTargetingDelay", ship.getModifiedItemAttr("covertOpsStealthBomberTargettingDelay"))
+                                  "cloakingTargetingDelay",
+                                  ship.getModifiedItemAttr("covertOpsStealthBomberTargettingDelay"))
diff --git a/eos/effects/covertwarfaremindlink.py b/eos/effects/covertwarfaremindlink.py
index 985db3a5a3..7dbda034f5 100644
--- a/eos/effects/covertwarfaremindlink.py
+++ b/eos/effects/covertwarfaremindlink.py
@@ -5,6 +5,8 @@
 # Implant: Imperial Navy Warfare Mindlink
 # Implant: Information Warfare Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.character.getSkill("Information Warfare").suppress()
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
diff --git a/eos/effects/cpumultiplierpostmulcpuoutputship.py b/eos/effects/cpumultiplierpostmulcpuoutputship.py
index 10022fdd03..99f186ce7c 100644
--- a/eos/effects/cpumultiplierpostmulcpuoutputship.py
+++ b/eos/effects/cpumultiplierpostmulcpuoutputship.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: CPU Enhancer (19 of 19)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("cpuOutput", module.getModifiedItemAttr("cpuMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("cpuOutput", module.getModifiedItemAttr("cpuMultiplier"))
diff --git a/eos/effects/cpuneedbonuseffecthybrid.py b/eos/effects/cpuneedbonuseffecthybrid.py
index 36a3d00291..b3e7d6c752 100644
--- a/eos/effects/cpuneedbonuseffecthybrid.py
+++ b/eos/effects/cpuneedbonuseffecthybrid.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Algid Hybrid Administrations Unit (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
\ No newline at end of file
+                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/cpuneedbonuseffectlasers.py b/eos/effects/cpuneedbonuseffectlasers.py
index 9c7d619652..6898986826 100644
--- a/eos/effects/cpuneedbonuseffectlasers.py
+++ b/eos/effects/cpuneedbonuseffectlasers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Algid Energy Administrations Unit (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
\ No newline at end of file
+                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/cpuoutputaddcpuoutputpassive.py b/eos/effects/cpuoutputaddcpuoutputpassive.py
index a3ac265ef9..10614e895b 100644
--- a/eos/effects/cpuoutputaddcpuoutputpassive.py
+++ b/eos/effects/cpuoutputaddcpuoutputpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Items from category: Subsystem (40 of 80)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("cpuOutput", module.getModifiedItemAttr("cpuOutput"))
diff --git a/eos/effects/crystalminingamountinfo2.py b/eos/effects/crystalminingamountinfo2.py
index 18a059c953..5c73058601 100644
--- a/eos/effects/crystalminingamountinfo2.py
+++ b/eos/effects/crystalminingamountinfo2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Frequency Mining Laser (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))
diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py
index 91eaf0bd51..743d13d9e0 100644
--- a/eos/effects/cynosuraldurationbonus.py
+++ b/eos/effects/cynosuraldurationbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Force Recon Ship (5 of 6)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field",
                                   "duration", ship.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/cynosuralgeneration.py b/eos/effects/cynosuralgeneration.py
index 4bbb9bea5f..b99325c0f3 100644
--- a/eos/effects/cynosuralgeneration.py
+++ b/eos/effects/cynosuralgeneration.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Cynosural Field (2 of 2)
 type = "active"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py
index 0302290429..0f66b0152c 100644
--- a/eos/effects/cynosuraltheoryconsumptionbonus.py
+++ b/eos/effects/cynosuraltheoryconsumptionbonus.py
@@ -4,7 +4,10 @@
 # Ships from group: Force Recon Ship (5 of 6)
 # Skill: Cynosural Field Theory
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field",
-                                  "consumptionQuantity", container.getModifiedItemAttr("consumptionQuantityBonusPercentage") * level)
+                                  "consumptionQuantity",
+                                  container.getModifiedItemAttr("consumptionQuantityBonusPercentage") * level)
diff --git a/eos/effects/damagecontrol.py b/eos/effects/damagecontrol.py
index 8ebdda53ec..e047e6afa1 100644
--- a/eos/effects/damagecontrol.py
+++ b/eos/effects/damagecontrol.py
@@ -4,6 +4,8 @@
 # Variations of module: Damage Control I (16 of 16)
 # Module: Civilian Damage Control
 type = "passive"
+
+
 def handler(fit, module, context):
     for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
         for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
diff --git a/eos/effects/dataminermoduledurationreduction.py b/eos/effects/dataminermoduledurationreduction.py
index 11ce137a66..aaa6af58a8 100644
--- a/eos/effects/dataminermoduledurationreduction.py
+++ b/eos/effects/dataminermoduledurationreduction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Data Miners",
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
\ No newline at end of file
+                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py b/eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py
index 74986e3e58..3760399942 100644
--- a/eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py
+++ b/eos/effects/dataminingskillboostaccessdifficultybonusabsolutepercent.py
@@ -5,6 +5,8 @@
 # Skill: Hacking
 # Skill: Salvaging
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), "accessDifficultyBonus",
                                      skill.getModifiedItemAttr("accessDifficultyBonusAbsolutePercent") * skill.level)
diff --git a/eos/effects/decreasetargetspeed.py b/eos/effects/decreasetargetspeed.py
index 7a6fbf9b0a..dd482175d3 100644
--- a/eos/effects/decreasetargetspeed.py
+++ b/eos/effects/decreasetargetspeed.py
@@ -1,7 +1,9 @@
 # Not used by any item
 type = "active", "projected"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         return
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/dohacking.py b/eos/effects/dohacking.py
index 59b61ce7ff..b41b91069a 100644
--- a/eos/effects/dohacking.py
+++ b/eos/effects/dohacking.py
@@ -4,5 +4,7 @@
 # Modules from group: Data Miners (15 of 16)
 # Module: QA Cross Protocol Analyzer
 type = "active"
+
+
 def handler(fit, module, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py
index 28d24015e6..94c4fb0ff5 100644
--- a/eos/effects/drawbackarmorhp.py
+++ b/eos/effects/drawbackarmorhp.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Rig Navigation (48 of 64)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackcapreppgneed.py b/eos/effects/drawbackcapreppgneed.py
index e004a94b40..e5812f5759 100644
--- a/eos/effects/drawbackcapreppgneed.py
+++ b/eos/effects/drawbackcapreppgneed.py
@@ -4,6 +4,8 @@
 # Variations of module: Capital Auxiliary Nano Pump I (2 of 2)
 # Variations of module: Capital Nanobot Accelerator I (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackcargocapacity.py b/eos/effects/drawbackcargocapacity.py
index 0168c002a3..07f5bf1712 100644
--- a/eos/effects/drawbackcargocapacity.py
+++ b/eos/effects/drawbackcargocapacity.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Transverse Bulkhead (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackcpuneedlaunchers.py b/eos/effects/drawbackcpuneedlaunchers.py
index 0b37c5b383..cb22a25235 100644
--- a/eos/effects/drawbackcpuneedlaunchers.py
+++ b/eos/effects/drawbackcpuneedlaunchers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Rig Launcher (48 of 48)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                   "cpu", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackcpuoutput.py b/eos/effects/drawbackcpuoutput.py
index 9395d78480..659199ee14 100644
--- a/eos/effects/drawbackcpuoutput.py
+++ b/eos/effects/drawbackcpuoutput.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Rig Drones (58 of 64)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackmaxvelocity.py b/eos/effects/drawbackmaxvelocity.py
index 69b7d225f7..8bdd806ae4 100644
--- a/eos/effects/drawbackmaxvelocity.py
+++ b/eos/effects/drawbackmaxvelocity.py
@@ -4,6 +4,8 @@
 # Modules from group: Rig Armor (48 of 72)
 # Modules from group: Rig Resource Processing (8 of 10)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("drawback"),
-                           stackingPenalties = True)
\ No newline at end of file
+                           stackingPenalties=True)
diff --git a/eos/effects/drawbackpowerneedhybrids.py b/eos/effects/drawbackpowerneedhybrids.py
index 8259352db2..68a8c4233a 100644
--- a/eos/effects/drawbackpowerneedhybrids.py
+++ b/eos/effects/drawbackpowerneedhybrids.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Rig Hybrid Weapon (56 of 56)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackpowerneedlasers.py b/eos/effects/drawbackpowerneedlasers.py
index 2bf170f503..addcabb175 100644
--- a/eos/effects/drawbackpowerneedlasers.py
+++ b/eos/effects/drawbackpowerneedlasers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Rig Energy Weapon (56 of 56)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackpowerneedprojectiles.py b/eos/effects/drawbackpowerneedprojectiles.py
index f0de234086..0f8490bfd9 100644
--- a/eos/effects/drawbackpowerneedprojectiles.py
+++ b/eos/effects/drawbackpowerneedprojectiles.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Rig Projectile Weapon (40 of 40)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackrepairsystemspgneed.py b/eos/effects/drawbackrepairsystemspgneed.py
index fa5dd2c570..1eba7dc3cc 100644
--- a/eos/effects/drawbackrepairsystemspgneed.py
+++ b/eos/effects/drawbackrepairsystemspgneed.py
@@ -4,6 +4,8 @@
 # Modules named like: Auxiliary Nano Pump (6 of 8)
 # Modules named like: Nanobot Accelerator (6 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "power", module.getModifiedItemAttr("drawback"))
\ No newline at end of file
+                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbackshieldcapacity.py b/eos/effects/drawbackshieldcapacity.py
index cfcea10a90..84887a5597 100644
--- a/eos/effects/drawbackshieldcapacity.py
+++ b/eos/effects/drawbackshieldcapacity.py
@@ -5,5 +5,7 @@
 # Modules from group: Rig Targeting (16 of 16)
 # Modules named like: Signal Focusing Kit (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/drawbacksigrad.py b/eos/effects/drawbacksigrad.py
index 95ad15a9b5..176bdd4238 100644
--- a/eos/effects/drawbacksigrad.py
+++ b/eos/effects/drawbacksigrad.py
@@ -4,5 +4,7 @@
 # Modules from group: Rig Shield (72 of 72)
 # Modules named like: Optimizer (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties = True)
+    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/drawbackwarpspeed.py b/eos/effects/drawbackwarpspeed.py
index 229a6cd146..a37a3e4418 100644
--- a/eos/effects/drawbackwarpspeed.py
+++ b/eos/effects/drawbackwarpspeed.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Rig Anchor (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/dreadnoughtmd1projdmgbonus.py b/eos/effects/dreadnoughtmd1projdmgbonus.py
index 33115de5ae..2d3ef6a037 100644
--- a/eos/effects/dreadnoughtmd1projdmgbonus.py
+++ b/eos/effects/dreadnoughtmd1projdmgbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Naglfar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1"), skill="Minmatar Dreadnought")
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1"),
+                                  skill="Minmatar Dreadnought")
diff --git a/eos/effects/dreadnoughtmd3projrofbonus.py b/eos/effects/dreadnoughtmd3projrofbonus.py
index 1dd5f70966..7cd152f78c 100644
--- a/eos/effects/dreadnoughtmd3projrofbonus.py
+++ b/eos/effects/dreadnoughtmd3projrofbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Naglfar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3"), skill="Minmatar Dreadnought")
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3"),
+                                  skill="Minmatar Dreadnought")
diff --git a/eos/effects/dreadnoughtshipbonushybriddmgg1.py b/eos/effects/dreadnoughtshipbonushybriddmgg1.py
index 316e4b01f8..61025aee32 100644
--- a/eos/effects/dreadnoughtshipbonushybriddmgg1.py
+++ b/eos/effects/dreadnoughtshipbonushybriddmgg1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Moros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1"), skill="Gallente Dreadnought")
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1"),
+                                  skill="Gallente Dreadnought")
diff --git a/eos/effects/dreadnoughtshipbonushybridrofg2.py b/eos/effects/dreadnoughtshipbonushybridrofg2.py
index 251e7c4087..0ff926ede9 100644
--- a/eos/effects/dreadnoughtshipbonushybridrofg2.py
+++ b/eos/effects/dreadnoughtshipbonushybridrofg2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Moros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2"), skill="Gallente Dreadnought")
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2"),
+                                  skill="Gallente Dreadnought")
diff --git a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
index f6d86d71bc..3202050af6 100644
--- a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
+++ b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Revelation
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1"), skill="Amarr Dreadnought")
+                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1"),
+                                  skill="Amarr Dreadnought")
diff --git a/eos/effects/dreadnoughtshipbonuslaserrofa2.py b/eos/effects/dreadnoughtshipbonuslaserrofa2.py
index a1563282db..faa54edf5e 100644
--- a/eos/effects/dreadnoughtshipbonuslaserrofa2.py
+++ b/eos/effects/dreadnoughtshipbonuslaserrofa2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Revelation
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2"), skill="Amarr Dreadnought")
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2"),
+                                  skill="Amarr Dreadnought")
diff --git a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
index 2d8266e690..0fca8e14ea 100644
--- a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
+++ b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
diff --git a/eos/effects/dronearmordamagebonuseffect.py b/eos/effects/dronearmordamagebonuseffect.py
index 4abe3984ca..18acef2dc4 100644
--- a/eos/effects/dronearmordamagebonuseffect.py
+++ b/eos/effects/dronearmordamagebonuseffect.py
@@ -5,6 +5,8 @@
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, ship, context):
     # This is actually level-less bonus, anyway you have to train cruisers 5
     # and will get 100% (20%/lvl as stated by description)
diff --git a/eos/effects/dronebandwidthaddpassive.py b/eos/effects/dronebandwidthaddpassive.py
index ed680c6c95..8dc9863407 100644
--- a/eos/effects/dronebandwidthaddpassive.py
+++ b/eos/effects/dronebandwidthaddpassive.py
@@ -4,5 +4,7 @@
 # Subsystems from group: Engineering Systems (13 of 16)
 # Subsystems from group: Offensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("droneBandwidth", module.getModifiedItemAttr("droneBandwidth"))
diff --git a/eos/effects/dronecapacityadddronecapacitypassive.py b/eos/effects/dronecapacityadddronecapacitypassive.py
index 64d04743c0..372e95c4bd 100644
--- a/eos/effects/dronecapacityadddronecapacitypassive.py
+++ b/eos/effects/dronecapacityadddronecapacitypassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Items from category: Subsystem (42 of 80)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("droneCapacity", module.getModifiedItemAttr("droneCapacity"))
diff --git a/eos/effects/dronedamagebonusonline.py b/eos/effects/dronedamagebonusonline.py
index 9c601f710a..13ad14a459 100644
--- a/eos/effects/dronedamagebonusonline.py
+++ b/eos/effects/dronedamagebonusonline.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Drone Damage Modules (11 of 11)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", module.getModifiedItemAttr("droneDamageBonus"),
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
diff --git a/eos/effects/dronedamagebonusrequringdrones.py b/eos/effects/dronedamagebonusrequringdrones.py
index 0baf75d991..5f3e13ea1b 100644
--- a/eos/effects/dronedamagebonusrequringdrones.py
+++ b/eos/effects/dronedamagebonusrequringdrones.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/dronedmgbonus.py b/eos/effects/dronedmgbonus.py
index 3407e3d69d..cf4d01efc5 100644
--- a/eos/effects/dronedmgbonus.py
+++ b/eos/effects/dronedmgbonus.py
@@ -4,6 +4,8 @@
 # Skills from group: Drones (8 of 23)
 # Skills named like: Drone Specialization (4 of 4)
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/dronedurabilityarmorhpbonus.py b/eos/effects/dronedurabilityarmorhpbonus.py
index a11211e861..9f22fa7629 100644
--- a/eos/effects/dronedurabilityarmorhpbonus.py
+++ b/eos/effects/dronedurabilityarmorhpbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                  "armorHP", module.getModifiedItemAttr("hullHpBonus"))
+                                 "armorHP", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/dronedurabilityarmorhpbonus2.py b/eos/effects/dronedurabilityarmorhpbonus2.py
index 5267b02c17..11190a8060 100644
--- a/eos/effects/dronedurabilityarmorhpbonus2.py
+++ b/eos/effects/dronedurabilityarmorhpbonus2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Drone Durability
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", skill.getModifiedItemAttr("armorHpBonus") * skill.level)
\ No newline at end of file
+                                 "armorHP", skill.getModifiedItemAttr("armorHpBonus") * skill.level)
diff --git a/eos/effects/dronedurabilityhpbonus.py b/eos/effects/dronedurabilityhpbonus.py
index 617873d03e..cbd2fb065b 100644
--- a/eos/effects/dronedurabilityhpbonus.py
+++ b/eos/effects/dronedurabilityhpbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/dronedurabilityshieldcapbonus.py b/eos/effects/dronedurabilityshieldcapbonus.py
index 1691d8f4b9..75f7c1ca76 100644
--- a/eos/effects/dronedurabilityshieldcapbonus.py
+++ b/eos/effects/dronedurabilityshieldcapbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                  "shieldCapacity", module.getModifiedItemAttr("hullHpBonus"))
+                                 "shieldCapacity", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/dronedurabilityshieldcapbonus2.py b/eos/effects/dronedurabilityshieldcapbonus2.py
index 628e2bff8a..511e422a4a 100644
--- a/eos/effects/dronedurabilityshieldcapbonus2.py
+++ b/eos/effects/dronedurabilityshieldcapbonus2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Drone Durability
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                  "shieldCapacity", skill.getModifiedItemAttr("shieldCapacityBonus") * skill.level)
+                                 "shieldCapacity", skill.getModifiedItemAttr("shieldCapacityBonus") * skill.level)
diff --git a/eos/effects/dronehullrepairbonuseffect.py b/eos/effects/dronehullrepairbonuseffect.py
index b13fa45005..2cb510cd4b 100644
--- a/eos/effects/dronehullrepairbonuseffect.py
+++ b/eos/effects/dronehullrepairbonuseffect.py
@@ -5,5 +5,8 @@
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount", src.getModifiedItemAttr("droneArmorDamageAmountBonus"))
\ No newline at end of file
+    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount",
+                                 src.getModifiedItemAttr("droneArmorDamageAmountBonus"))
diff --git a/eos/effects/dronemaxrangebonus.py b/eos/effects/dronemaxrangebonus.py
index be1ecde595..fba4a35bc9 100644
--- a/eos/effects/dronemaxrangebonus.py
+++ b/eos/effects/dronemaxrangebonus.py
@@ -3,10 +3,12 @@
 # Used by:
 # Modules named like: Drone Scope Chip (6 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     stacking = False if "skill" in context else True
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxRange",
                                  container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                 stackingPenalties = stacking)
+                                 stackingPenalties=stacking)
diff --git a/eos/effects/dronemaxvelocitybonus.py b/eos/effects/dronemaxvelocitybonus.py
index 2e0f310bd1..938b34fa0e 100644
--- a/eos/effects/dronemaxvelocitybonus.py
+++ b/eos/effects/dronemaxvelocitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Drone Speed Augmentor (6 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/dronemwdspeedbonus.py b/eos/effects/dronemwdspeedbonus.py
index a07ed7b0e5..692959ae42 100644
--- a/eos/effects/dronemwdspeedbonus.py
+++ b/eos/effects/dronemwdspeedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Drone Navigation Computer (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), "maxVelocity",
-                                 module.getModifiedItemAttr("speedFactor"), stackingPenalties = True)
+                                 module.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
diff --git a/eos/effects/dronerangebonusadd.py b/eos/effects/dronerangebonusadd.py
index bb21bdfb67..7908257236 100644
--- a/eos/effects/dronerangebonusadd.py
+++ b/eos/effects/dronerangebonusadd.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Drone Control Range Module (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("droneRangeBonus")
     fit.extraAttributes.increase("droneControlRange", amount)
diff --git a/eos/effects/dronerigstasiswebspeedfactorbonus.py b/eos/effects/dronerigstasiswebspeedfactorbonus.py
index b2add0ca86..7f060a2912 100644
--- a/eos/effects/dronerigstasiswebspeedfactorbonus.py
+++ b/eos/effects/dronerigstasiswebspeedfactorbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Stasis Drone Augmentor (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Stasis Webifying Drone",
-                                 "speedFactor", module.getModifiedItemAttr("webSpeedFactorBonus"))
\ No newline at end of file
+                                 "speedFactor", module.getModifiedItemAttr("webSpeedFactorBonus"))
diff --git a/eos/effects/dronesalvagebonus.py b/eos/effects/dronesalvagebonus.py
index 4fcdadf7e8..1e9deef53a 100644
--- a/eos/effects/dronesalvagebonus.py
+++ b/eos/effects/dronesalvagebonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Salvage Drone Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill("Salvage Drone Operation"),
-                                    "accessDifficultyBonus", container.getModifiedItemAttr("accessDifficultyBonus") * container.level)
+                                    "accessDifficultyBonus",
+                                    container.getModifiedItemAttr("accessDifficultyBonus") * container.level)
diff --git a/eos/effects/droneshieldbonusbonuseffect.py b/eos/effects/droneshieldbonusbonuseffect.py
index 7d6f083d4c..816d1bc0aa 100644
--- a/eos/effects/droneshieldbonusbonuseffect.py
+++ b/eos/effects/droneshieldbonusbonuseffect.py
@@ -5,6 +5,8 @@
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, ship, context):
     # This is actually level-less bonus, anyway you have to train cruisers 5
     # and will get 100% (20%/lvl as stated by description)
diff --git a/eos/effects/dronesmaxactivedronebonusmodaddmaxactiveactive.py b/eos/effects/dronesmaxactivedronebonusmodaddmaxactiveactive.py
index 729247c939..5bf55b8cc3 100644
--- a/eos/effects/dronesmaxactivedronebonusmodaddmaxactiveactive.py
+++ b/eos/effects/dronesmaxactivedronebonusmodaddmaxactiveactive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Drone Control Unit (5 of 5)
 type = "active"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("maxActiveDroneBonus")
     fit.extraAttributes.increase("maxActiveDrones", amount)
diff --git a/eos/effects/dronesskillboostmaxactivedronebonus.py b/eos/effects/dronesskillboostmaxactivedronebonus.py
index d90708b05d..aae3f84a74 100644
--- a/eos/effects/dronesskillboostmaxactivedronebonus.py
+++ b/eos/effects/dronesskillboostmaxactivedronebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Drones
 type = "passive"
+
+
 def handler(fit, skill, context):
     amount = skill.getModifiedItemAttr("maxActiveDroneBonus") * skill.level
     fit.extraAttributes.increase("maxActiveDrones", amount)
diff --git a/eos/effects/dronetrackingcomputerbonus.py b/eos/effects/dronetrackingcomputerbonus.py
index 95751303ed..f33ab26000 100644
--- a/eos/effects/dronetrackingcomputerbonus.py
+++ b/eos/effects/dronetrackingcomputerbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Drone Tracking Modules (10 of 10)
 type = "active"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
@@ -13,4 +15,3 @@ def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
                                  stackingPenalties=True)
-
diff --git a/eos/effects/dronetrackingenhancerbonus.py b/eos/effects/dronetrackingenhancerbonus.py
index 4d97c4fab1..a9cc82a32c 100644
--- a/eos/effects/dronetrackingenhancerbonus.py
+++ b/eos/effects/dronetrackingenhancerbonus.py
@@ -3,13 +3,15 @@
 # Used by:
 # Modules from group: Drone Tracking Enhancer (10 of 10)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
diff --git a/eos/effects/durationbonusforgroupafterburner.py b/eos/effects/durationbonusforgroupafterburner.py
index 9ab34454ab..d193ca6ef1 100644
--- a/eos/effects/durationbonusforgroupafterburner.py
+++ b/eos/effects/durationbonusforgroupafterburner.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Engine Thermal Shielding (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "duration", module.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/ecmburst.py b/eos/effects/ecmburst.py
index 050379d882..9b4ebf30e5 100644
--- a/eos/effects/ecmburst.py
+++ b/eos/effects/ecmburst.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Burst Jammer (11 of 11)
 type = "active"
+
+
 def handler(fit, module, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/ecmburstjammer.py b/eos/effects/ecmburstjammer.py
index aeba8cc537..1d733e6506 100644
--- a/eos/effects/ecmburstjammer.py
+++ b/eos/effects/ecmburstjammer.py
@@ -3,9 +3,11 @@
 # Used by:
 # Modules from group: Burst Jammer (11 of 11)
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
 
-        fit.ecmProjectedStr *= strModifier
\ No newline at end of file
+        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/ecmgravimetricstrengthbonuspercent.py b/eos/effects/ecmgravimetricstrengthbonuspercent.py
index 09c35314e8..35bac76685 100644
--- a/eos/effects/ecmgravimetricstrengthbonuspercent.py
+++ b/eos/effects/ecmgravimetricstrengthbonuspercent.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: ECM Stabilizer (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "scanGravimetricStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ecmladarstrengthbonuspercent.py b/eos/effects/ecmladarstrengthbonuspercent.py
index 89d2833dc7..1ff5830a87 100644
--- a/eos/effects/ecmladarstrengthbonuspercent.py
+++ b/eos/effects/ecmladarstrengthbonuspercent.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: ECM Stabilizer (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "scanLadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ecmmagnetometricstrengthbonuspercent.py b/eos/effects/ecmmagnetometricstrengthbonuspercent.py
index 4b0f712651..84eb6163d7 100644
--- a/eos/effects/ecmmagnetometricstrengthbonuspercent.py
+++ b/eos/effects/ecmmagnetometricstrengthbonuspercent.py
@@ -3,7 +3,10 @@
 # Used by:
 # Modules from group: ECM Stabilizer (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties = True)
+                                  "scanMagnetometricStrengthBonus",
+                                  module.getModifiedItemAttr("ecmStrengthBonusPercent"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/ecmradarstrengthbonuspercent.py b/eos/effects/ecmradarstrengthbonuspercent.py
index 6bc8890a6a..a70573cdc9 100644
--- a/eos/effects/ecmradarstrengthbonuspercent.py
+++ b/eos/effects/ecmradarstrengthbonuspercent.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: ECM Stabilizer (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "scanRadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ecmrangebonusmoduleeffect.py b/eos/effects/ecmrangebonusmoduleeffect.py
index 2958d18c00..5300152bc4 100644
--- a/eos/effects/ecmrangebonusmoduleeffect.py
+++ b/eos/effects/ecmrangebonusmoduleeffect.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: ECM Stabilizer (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "maxRange", module.getModifiedItemAttr("ecmRangeBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/electronicattributemodifyonline.py b/eos/effects/electronicattributemodifyonline.py
index 13647558ca..28197f971f 100644
--- a/eos/effects/electronicattributemodifyonline.py
+++ b/eos/effects/electronicattributemodifyonline.py
@@ -4,5 +4,7 @@
 # Modules from group: Automated Targeting System (6 of 6)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py
index fab22b9230..ca69bef68b 100644
--- a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py
+++ b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py
@@ -6,6 +6,8 @@
 # Implant: Genolution Core Augmentation CA-2
 # Skill: CPU Management
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("cpuOutput", container.getModifiedItemAttr("cpuOutputBonus2") * level)
diff --git a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py
index 0dcb9f4b73..0ae042d2da 100644
--- a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py
+++ b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Exhumer (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
                                   "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/elitebargebonusminingdurationbarge2.py b/eos/effects/elitebargebonusminingdurationbarge2.py
index d664e7b673..6009d95429 100644
--- a/eos/effects/elitebargebonusminingdurationbarge2.py
+++ b/eos/effects/elitebargebonusminingdurationbarge2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Exhumer (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
                                   "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/elitebargeshieldresistance1.py b/eos/effects/elitebargeshieldresistance1.py
index e9d1b0d2e4..33f370af1d 100644
--- a/eos/effects/elitebargeshieldresistance1.py
+++ b/eos/effects/elitebargeshieldresistance1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Exhumer (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
diff --git a/eos/effects/elitebonusassaultshiplightmissilerof.py b/eos/effects/elitebonusassaultshiplightmissilerof.py
index d85fb7b455..1f9169e7ec 100644
--- a/eos/effects/elitebonusassaultshiplightmissilerof.py
+++ b/eos/effects/elitebonusassaultshiplightmissilerof.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cambion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Light",
                                   "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusassaultshipmissilevelocity1.py b/eos/effects/elitebonusassaultshipmissilevelocity1.py
index 7cf9c2e739..2031a3db36 100644
--- a/eos/effects/elitebonusassaultshipmissilevelocity1.py
+++ b/eos/effects/elitebonusassaultshipmissilevelocity1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                                    skill="Assault Frigates")
diff --git a/eos/effects/elitebonusassaultshiprocketrof.py b/eos/effects/elitebonusassaultshiprocketrof.py
index 6964fa1885..4d76220632 100644
--- a/eos/effects/elitebonusassaultshiprocketrof.py
+++ b/eos/effects/elitebonusassaultshiprocketrof.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cambion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
                                   "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusblackopsagiliy1.py b/eos/effects/elitebonusblackopsagiliy1.py
index b71a307162..d5a92e778e 100644
--- a/eos/effects/elitebonusblackopsagiliy1.py
+++ b/eos/effects/elitebonusblackopsagiliy1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Sin
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
\ No newline at end of file
+    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/elitebonusblackopscloakvelocity2.py b/eos/effects/elitebonusblackopscloakvelocity2.py
index 557a23df94..170e15e6de 100644
--- a/eos/effects/elitebonusblackopscloakvelocity2.py
+++ b/eos/effects/elitebonusblackopscloakvelocity2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Black Ops (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     if fit.extraAttributes["cloaked"]:
         fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2"), skill="Black Ops")
diff --git a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
index e90117b2a7..dc97412086 100644
--- a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
+++ b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
@@ -3,8 +3,11 @@
 # Used by:
 # Ship: Widow
 type = "passive"
+
+
 def handler(fit, ship, context):
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for type in sensorTypes:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "scan{0}StrengthBonus".format(type),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
+                                      "scan{0}StrengthBonus".format(type),
                                       ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py b/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py
index d5251486bd..6fb22fc13a 100644
--- a/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py
+++ b/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Widow
 type = "passive"
+
+
 def handler(fit, ship, context):
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for type in sensorTypes:
diff --git a/eos/effects/elitebonusblackopslargeenergyturrettracking1.py b/eos/effects/elitebonusblackopslargeenergyturrettracking1.py
index 1cc54e4829..0d20b2c44f 100644
--- a/eos/effects/elitebonusblackopslargeenergyturrettracking1.py
+++ b/eos/effects/elitebonusblackopslargeenergyturrettracking1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Redeemer
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/elitebonusblackopsmaxvelocity1.py b/eos/effects/elitebonusblackopsmaxvelocity1.py
index 98ff1dc287..8fe20233cd 100644
--- a/eos/effects/elitebonusblackopsmaxvelocity1.py
+++ b/eos/effects/elitebonusblackopsmaxvelocity1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Panther
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
\ No newline at end of file
+    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/elitebonuscommanddestroyerarmored1.py b/eos/effects/elitebonuscommanddestroyerarmored1.py
index 63a0674c5f..f71c8c2aac 100644
--- a/eos/effects/elitebonuscommanddestroyerarmored1.py
+++ b/eos/effects/elitebonuscommanddestroyerarmored1.py
@@ -4,5 +4,8 @@
 # Ship: Magus
 # Ship: Pontifex
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerinfo1.py b/eos/effects/elitebonuscommanddestroyerinfo1.py
index 097d722719..7cf94666ae 100644
--- a/eos/effects/elitebonuscommanddestroyerinfo1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfo1.py
@@ -4,5 +4,8 @@
 # Ship: Pontifex
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerinfohidden1.py b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
index 4704e5b86b..ad84383f3f 100644
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -4,5 +4,9 @@
 # Ship: Pontifex
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
+                                  "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"),
+                                  skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyermjfgspool2.py b/eos/effects/elitebonuscommanddestroyermjfgspool2.py
index a2f7965a22..1b9aa7af9b 100644
--- a/eos/effects/elitebonuscommanddestroyermjfgspool2.py
+++ b/eos/effects/elitebonuscommanddestroyermjfgspool2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Command Destroyer (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration", src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
index 330679036c..f9c1fded2d 100644
--- a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
+++ b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
@@ -1,4 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyersiege1.py b/eos/effects/elitebonuscommanddestroyersiege1.py
index 87bb356610..fffe545840 100644
--- a/eos/effects/elitebonuscommanddestroyersiege1.py
+++ b/eos/effects/elitebonuscommanddestroyersiege1.py
@@ -4,5 +4,8 @@
 # Ship: Bifrost
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommanddestroyerskirmish1.py b/eos/effects/elitebonuscommanddestroyerskirmish1.py
index cd30425e6c..a2cd64b25a 100644
--- a/eos/effects/elitebonuscommanddestroyerskirmish1.py
+++ b/eos/effects/elitebonuscommanddestroyerskirmish1.py
@@ -4,5 +4,8 @@
 # Ship: Bifrost
 # Ship: Magus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/elitebonuscommandshiparmoredcs3.py b/eos/effects/elitebonuscommandshiparmoredcs3.py
index d801e659d9..7161b1b1f3 100644
--- a/eos/effects/elitebonuscommandshiparmoredcs3.py
+++ b/eos/effects/elitebonuscommandshiparmoredcs3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
+                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiparmorhp1.py b/eos/effects/elitebonuscommandshiparmorhp1.py
index 81ef932b1a..c8492c1307 100644
--- a/eos/effects/elitebonuscommandshiparmorhp1.py
+++ b/eos/effects/elitebonuscommandshiparmorhp1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Damnation
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
\ No newline at end of file
+    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiphamrofcs1.py b/eos/effects/elitebonuscommandshiphamrofcs1.py
index 63eaf51a97..d57f9df198 100644
--- a/eos/effects/elitebonuscommandshiphamrofcs1.py
+++ b/eos/effects/elitebonuscommandshiphamrofcs1.py
@@ -4,6 +4,8 @@
 # Ship: Claymore
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
                                   "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py
index 18aa69a30d..866509be5e 100644
--- a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py
+++ b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py
@@ -3,8 +3,11 @@
 # Used by:
 # Ship: Damnation
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                        "{0}Damage".format(damageType),
+                                        ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py
index 1bcf86d542..7e359e3e03 100644
--- a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py
+++ b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Eos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                 skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py
index b71aab5bd9..8b105c48a4 100644
--- a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py
+++ b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Eos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                 skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py
index 0c77bf2316..f6f10902c6 100644
--- a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py
+++ b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py
@@ -3,8 +3,11 @@
 # Used by:
 # Ship: Damnation
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                        "{0}Damage".format(damageType),
+                                        ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiphmrofcs1.py b/eos/effects/elitebonuscommandshiphmrofcs1.py
index cfb685d19b..2907e08853 100644
--- a/eos/effects/elitebonuscommandshiphmrofcs1.py
+++ b/eos/effects/elitebonuscommandshiphmrofcs1.py
@@ -4,6 +4,8 @@
 # Ship: Claymore
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
                                   "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiphybridfalloffcs2.py b/eos/effects/elitebonuscommandshiphybridfalloffcs2.py
index 785a1e69ad..a2a89d17d9 100644
--- a/eos/effects/elitebonuscommandshiphybridfalloffcs2.py
+++ b/eos/effects/elitebonuscommandshiphybridfalloffcs2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Astarte
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiphybridoptimalcs1.py b/eos/effects/elitebonuscommandshiphybridoptimalcs1.py
index 706a6876fb..c26d77ef6c 100644
--- a/eos/effects/elitebonuscommandshiphybridoptimalcs1.py
+++ b/eos/effects/elitebonuscommandshiphybridoptimalcs1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipinformationcs3.py b/eos/effects/elitebonuscommandshipinformationcs3.py
index 0a982f2d11..d080aced40 100644
--- a/eos/effects/elitebonuscommandshipinformationcs3.py
+++ b/eos/effects/elitebonuscommandshipinformationcs3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
+                                  "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipinformationhiddencs3.py b/eos/effects/elitebonuscommandshipinformationhiddencs3.py
index fee3ea437a..1aeda4156b 100644
--- a/eos/effects/elitebonuscommandshipinformationhiddencs3.py
+++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
+                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiplaserdamagecs1.py b/eos/effects/elitebonuscommandshiplaserdamagecs1.py
index 9dc55f3d47..a14f6cd700 100644
--- a/eos/effects/elitebonuscommandshiplaserdamagecs1.py
+++ b/eos/effects/elitebonuscommandshiplaserdamagecs1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshiplaserrofcs2.py b/eos/effects/elitebonuscommandshiplaserrofcs2.py
index 0df96f5bf2..50b0624e1c 100644
--- a/eos/effects/elitebonuscommandshiplaserrofcs2.py
+++ b/eos/effects/elitebonuscommandshiplaserrofcs2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py
index e5910f8f70..5f491a84b6 100644
--- a/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py
+++ b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py
index bd5344ef2d..b7cec2d64f 100644
--- a/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py
+++ b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Astarte
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py
index b1662054ec..5d855b11c2 100644
--- a/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py
+++ b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Eos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipprojectiledamagecs1.py b/eos/effects/elitebonuscommandshipprojectiledamagecs1.py
index 6929f463de..c6fdde8913 100644
--- a/eos/effects/elitebonuscommandshipprojectiledamagecs1.py
+++ b/eos/effects/elitebonuscommandshipprojectiledamagecs1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Sleipnir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py b/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py
index 93833cb9a4..074b7aaad4 100644
--- a/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py
+++ b/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sleipnir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py
index fd81ed8441..dc04674b72 100644
--- a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py
+++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                    skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py
index 0d64070192..45b63167cf 100644
--- a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py
+++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Claymore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                    skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py
index 22c395a969..7200ea6772 100644
--- a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py
+++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                    skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py
index 626a5525c8..af5122311e 100644
--- a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py
+++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Claymore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
+                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
+                                    skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipsiegecs3.py b/eos/effects/elitebonuscommandshipsiegecs3.py
index 879e873073..97938801cc 100644
--- a/eos/effects/elitebonuscommandshipsiegecs3.py
+++ b/eos/effects/elitebonuscommandshipsiegecs3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
-                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
+                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscommandshipskirmishcs3.py b/eos/effects/elitebonuscommandshipskirmishcs3.py
index aa9c020b5e..5153042dbc 100644
--- a/eos/effects/elitebonuscommandshipskirmishcs3.py
+++ b/eos/effects/elitebonuscommandshipskirmishcs3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
-                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
+                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"),
+                                  skill="Command Ships")
diff --git a/eos/effects/elitebonuscoveropsbombemdmg1.py b/eos/effects/elitebonuscoveropsbombemdmg1.py
index 4c965a7223..0c4adf51c4 100644
--- a/eos/effects/elitebonuscoveropsbombemdmg1.py
+++ b/eos/effects/elitebonuscoveropsbombemdmg1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Purifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                     "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
diff --git a/eos/effects/elitebonuscoveropsbombexplosivedmg1.py b/eos/effects/elitebonuscoveropsbombexplosivedmg1.py
index a9e0e21933..6bca484354 100644
--- a/eos/effects/elitebonuscoveropsbombexplosivedmg1.py
+++ b/eos/effects/elitebonuscoveropsbombexplosivedmg1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hound
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/elitebonuscoveropsbombkineticdmg1.py b/eos/effects/elitebonuscoveropsbombkineticdmg1.py
index 401d5ab4f7..bbab8ded0c 100644
--- a/eos/effects/elitebonuscoveropsbombkineticdmg1.py
+++ b/eos/effects/elitebonuscoveropsbombkineticdmg1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Manticore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/elitebonuscoveropsbombthermaldmg1.py b/eos/effects/elitebonuscoveropsbombthermaldmg1.py
index 4859ab88c0..13dd5af5af 100644
--- a/eos/effects/elitebonuscoveropsbombthermaldmg1.py
+++ b/eos/effects/elitebonuscoveropsbombthermaldmg1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nemesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/elitebonuscoveropsscanprobestrength2.py
index fd767798c9..2c1af51b8e 100644
--- a/eos/effects/elitebonuscoveropsscanprobestrength2.py
+++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Covert Ops (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
+                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py b/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py
index 3113f1b809..bb5fa326eb 100644
--- a/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py
+++ b/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Kitsune
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships")
+    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
+                           skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py b/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py
index 8c0f338f15..4b5fdb0fd7 100644
--- a/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py
+++ b/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Kitsune
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshiprechargerate2.py b/eos/effects/elitebonuselectronicattackshiprechargerate2.py
index 268ab14837..b9d5bbf341 100644
--- a/eos/effects/elitebonuselectronicattackshiprechargerate2.py
+++ b/eos/effects/elitebonuselectronicattackshiprechargerate2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships")
+    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
+                           skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipsignatureradius2.py b/eos/effects/elitebonuselectronicattackshipsignatureradius2.py
index c484c89aa4..29dfc8f55e 100644
--- a/eos/effects/elitebonuselectronicattackshipsignatureradius2.py
+++ b/eos/effects/elitebonuselectronicattackshipsignatureradius2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Hyena
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships")
+    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
+                           skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py b/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py
index 9929787f36..929219c968 100644
--- a/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py
+++ b/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hyena
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py b/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py
index 61d9a842bd..63e03d14d0 100644
--- a/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py
+++ b/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Keres
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py b/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py
index bc32c86519..20e48def71 100644
--- a/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py
+++ b/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Keres
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonusexpeditionmining1.py b/eos/effects/elitebonusexpeditionmining1.py
index a2b899efbf..5ca7897284 100644
--- a/eos/effects/elitebonusexpeditionmining1.py
+++ b/eos/effects/elitebonusexpeditionmining1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Prospect
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
+                                  "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1"),
+                                  skill="Expedition Frigates")
diff --git a/eos/effects/elitebonusexpeditionsigradius2.py b/eos/effects/elitebonusexpeditionsigradius2.py
index 323d167cd8..711200e582 100644
--- a/eos/effects/elitebonusexpeditionsigradius2.py
+++ b/eos/effects/elitebonusexpeditionsigradius2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Prospect
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
+    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2"),
+                           skill="Expedition Frigates")
diff --git a/eos/effects/elitebonusgunshiparmoremresistance1.py b/eos/effects/elitebonusgunshiparmoremresistance1.py
index 7bfc78fa60..d65a4a1484 100644
--- a/eos/effects/elitebonusgunshiparmoremresistance1.py
+++ b/eos/effects/elitebonusgunshiparmoremresistance1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
+    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                           skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py b/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py
index 1fbee4376c..937dd73095 100644
--- a/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py
+++ b/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                           skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiparmorkineticresistance1.py b/eos/effects/elitebonusgunshiparmorkineticresistance1.py
index 08bb87f3a8..e9be2dd529 100644
--- a/eos/effects/elitebonusgunshiparmorkineticresistance1.py
+++ b/eos/effects/elitebonusgunshiparmorkineticresistance1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                           skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiparmorthermalresistance1.py b/eos/effects/elitebonusgunshiparmorthermalresistance1.py
index b348472b78..ef7175b0b0 100644
--- a/eos/effects/elitebonusgunshiparmorthermalresistance1.py
+++ b/eos/effects/elitebonusgunshiparmorthermalresistance1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                           skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipcaprecharge2.py b/eos/effects/elitebonusgunshipcaprecharge2.py
index a53903eb02..ddce4507cc 100644
--- a/eos/effects/elitebonusgunshipcaprecharge2.py
+++ b/eos/effects/elitebonusgunshipcaprecharge2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipdronecapacity2.py b/eos/effects/elitebonusgunshipdronecapacity2.py
index 29763eb8c9..47dc4249be 100644
--- a/eos/effects/elitebonusgunshipdronecapacity2.py
+++ b/eos/effects/elitebonusgunshipdronecapacity2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Ishkur
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+    fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiphybriddmg2.py b/eos/effects/elitebonusgunshiphybriddmg2.py
index 3ca3ec64a6..2b5b31e5d2 100644
--- a/eos/effects/elitebonusgunshiphybriddmg2.py
+++ b/eos/effects/elitebonusgunshiphybriddmg2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Harpy
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiphybridoptimal1.py b/eos/effects/elitebonusgunshiphybridoptimal1.py
index 0e39580e64..df9a7dbb00 100644
--- a/eos/effects/elitebonusgunshiphybridoptimal1.py
+++ b/eos/effects/elitebonusgunshiphybridoptimal1.py
@@ -5,6 +5,8 @@
 # Ship: Harpy
 # Ship: Ishkur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiphybridtracking2.py b/eos/effects/elitebonusgunshiphybridtracking2.py
index 816b2d8c32..9fc26ca51a 100644
--- a/eos/effects/elitebonusgunshiphybridtracking2.py
+++ b/eos/effects/elitebonusgunshiphybridtracking2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Enyo
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiplaserdamage2.py b/eos/effects/elitebonusgunshiplaserdamage2.py
index 4f75755de9..198854651d 100644
--- a/eos/effects/elitebonusgunshiplaserdamage2.py
+++ b/eos/effects/elitebonusgunshiplaserdamage2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Retribution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshiplaseroptimal1.py b/eos/effects/elitebonusgunshiplaseroptimal1.py
index d9a7ffc33c..ea410651b9 100644
--- a/eos/effects/elitebonusgunshiplaseroptimal1.py
+++ b/eos/effects/elitebonusgunshiplaseroptimal1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Retribution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipprojectiledamage1.py b/eos/effects/elitebonusgunshipprojectiledamage1.py
index 977f6fc9c0..f0545ec680 100644
--- a/eos/effects/elitebonusgunshipprojectiledamage1.py
+++ b/eos/effects/elitebonusgunshipprojectiledamage1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Wolf
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipprojectiledamage2.py b/eos/effects/elitebonusgunshipprojectiledamage2.py
index a9819287f1..09f2df3ad1 100644
--- a/eos/effects/elitebonusgunshipprojectiledamage2.py
+++ b/eos/effects/elitebonusgunshipprojectiledamage2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Jaguar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipprojectilefalloff2.py b/eos/effects/elitebonusgunshipprojectilefalloff2.py
index 90e636405b..df8ed9532a 100644
--- a/eos/effects/elitebonusgunshipprojectilefalloff2.py
+++ b/eos/effects/elitebonusgunshipprojectilefalloff2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Wolf
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
\ No newline at end of file
+                                  "falloff", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipprojectileoptimal1.py b/eos/effects/elitebonusgunshipprojectileoptimal1.py
index 31fe35fbb3..b1df7d2475 100644
--- a/eos/effects/elitebonusgunshipprojectileoptimal1.py
+++ b/eos/effects/elitebonusgunshipprojectileoptimal1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Jaguar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/elitebonusgunshipshieldboost2.py b/eos/effects/elitebonusgunshipshieldboost2.py
index b8ce48c2f4..883b11110e 100644
--- a/eos/effects/elitebonusgunshipshieldboost2.py
+++ b/eos/effects/elitebonusgunshipshieldboost2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
+                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2"),
+                                  skill="Assault Frigates")
diff --git a/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py b/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py
index 3c2d4208f7..8ff8a12c94 100644
--- a/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py
+++ b/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py
index c18d7932a6..27b7cefbaf 100644
--- a/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py
+++ b/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py
index b21e057b03..8c2a950178 100644
--- a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py
+++ b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.extraAttributes.increase("droneControlRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+    fit.extraAttributes.increase("droneControlRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py b/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py
index 4792576436..e3aa5470f1 100644
--- a/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py
+++ b/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy Assault", "Missile Launcher Heavy")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py
index 41c8274a96..c3de080b1f 100644
--- a/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py
+++ b/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py b/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py
index 5cf9a92989..3e27994839 100644
--- a/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py
+++ b/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py
index c6e7fe20a4..178f96aa95 100644
--- a/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py
+++ b/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiphybriddmg2.py b/eos/effects/elitebonusheavygunshiphybriddmg2.py
index 154fa6ea20..c2cfc53cbd 100644
--- a/eos/effects/elitebonusheavygunshiphybriddmg2.py
+++ b/eos/effects/elitebonusheavygunshiphybriddmg2.py
@@ -4,6 +4,9 @@
 # Ship: Deimos
 # Ship: Eagle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiphybridfalloff1.py b/eos/effects/elitebonusheavygunshiphybridfalloff1.py
index 3940ad2d8e..11e858e784 100644
--- a/eos/effects/elitebonusheavygunshiphybridfalloff1.py
+++ b/eos/effects/elitebonusheavygunshiphybridfalloff1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Deimos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiphybridoptimal1.py b/eos/effects/elitebonusheavygunshiphybridoptimal1.py
index 8416942c70..1c697dcd9b 100644
--- a/eos/effects/elitebonusheavygunshiphybridoptimal1.py
+++ b/eos/effects/elitebonusheavygunshiphybridoptimal1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Eagle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiplaserdmg2.py b/eos/effects/elitebonusheavygunshiplaserdmg2.py
index fa06cd039b..fb52f881d7 100644
--- a/eos/effects/elitebonusheavygunshiplaserdmg2.py
+++ b/eos/effects/elitebonusheavygunshiplaserdmg2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Zealot
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiplaseroptimal1.py b/eos/effects/elitebonusheavygunshiplaseroptimal1.py
index 99fe315c49..8b292f8248 100644
--- a/eos/effects/elitebonusheavygunshiplaseroptimal1.py
+++ b/eos/effects/elitebonusheavygunshiplaseroptimal1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Zealot
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py b/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py
index a2b2979148..c4244df024 100644
--- a/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py
+++ b/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipprojectiledmg2.py b/eos/effects/elitebonusheavygunshipprojectiledmg2.py
index b3c4bd1ed6..92a9f90494 100644
--- a/eos/effects/elitebonusheavygunshipprojectiledmg2.py
+++ b/eos/effects/elitebonusheavygunshipprojectiledmg2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Vagabond
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipprojectilefalloff1.py b/eos/effects/elitebonusheavygunshipprojectilefalloff1.py
index 094d92c8e1..310bc6bb19 100644
--- a/eos/effects/elitebonusheavygunshipprojectilefalloff1.py
+++ b/eos/effects/elitebonusheavygunshipprojectilefalloff1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Vagabond
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipprojectileoptimal1.py b/eos/effects/elitebonusheavygunshipprojectileoptimal1.py
index c03dd91c8a..4d9a93161d 100644
--- a/eos/effects/elitebonusheavygunshipprojectileoptimal1.py
+++ b/eos/effects/elitebonusheavygunshipprojectileoptimal1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Muninn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavygunshipprojectiletracking2.py b/eos/effects/elitebonusheavygunshipprojectiletracking2.py
index 6d4f337035..a4f3e915b7 100644
--- a/eos/effects/elitebonusheavygunshipprojectiletracking2.py
+++ b/eos/effects/elitebonusheavygunshipprojectiletracking2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Muninn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py b/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py
index 8117c86865..ef0e914560 100644
--- a/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py
+++ b/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Onyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py b/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py
index e8a71bde1c..6f5239340e 100644
--- a/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py
+++ b/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Onyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py b/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py
index a5e6173b20..aee02924c3 100644
--- a/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py
+++ b/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Onyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py b/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py
index cd63ce6b39..a257bc062e 100644
--- a/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py
+++ b/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Phobos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorsmetoptimal.py b/eos/effects/elitebonusheavyinterdictorsmetoptimal.py
index c6bace5fc2..f671da4c64 100644
--- a/eos/effects/elitebonusheavyinterdictorsmetoptimal.py
+++ b/eos/effects/elitebonusheavyinterdictorsmetoptimal.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Devoter
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py b/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py
index 745cc760d3..b5d232374d 100644
--- a/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py
+++ b/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Broadsword
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers")
+                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
+                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
index edf638622d..20a47e364b 100644
--- a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
+++ b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Heavy Interdiction Cruiser (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",
-                                  "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2"), skill="Heavy Interdiction Cruisers")
\ No newline at end of file
+                                  "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2"),
+                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/elitebonusinterdictorsarmorresist1.py b/eos/effects/elitebonusinterdictorsarmorresist1.py
index 5fe8c49606..7a1492fc81 100644
--- a/eos/effects/elitebonusinterdictorsarmorresist1.py
+++ b/eos/effects/elitebonusinterdictorsarmorresist1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Heretic
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
         fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
diff --git a/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py b/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py
index b8dd6e07fa..310c195041 100644
--- a/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py
+++ b/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Flycatcher
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
+        "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/elitebonusinterdictorsmwdsigradius2.py b/eos/effects/elitebonusinterdictorsmwdsigradius2.py
index 2ced01dde4..5107837b54 100644
--- a/eos/effects/elitebonusinterdictorsmwdsigradius2.py
+++ b/eos/effects/elitebonusinterdictorsmwdsigradius2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Interdictor (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2"), skill="Interdictors")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2"),
+                                  skill="Interdictors")
diff --git a/eos/effects/elitebonusinterdictorsprojectilefalloff1.py b/eos/effects/elitebonusinterdictorsprojectilefalloff1.py
index b23c1cddc8..2b7450e2b1 100644
--- a/eos/effects/elitebonusinterdictorsprojectilefalloff1.py
+++ b/eos/effects/elitebonusinterdictorsprojectilefalloff1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sabre
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/elitebonusinterdictorsshtrof1.py b/eos/effects/elitebonusinterdictorsshtrof1.py
index 4b9b2796c7..a01812c190 100644
--- a/eos/effects/elitebonusinterdictorsshtrof1.py
+++ b/eos/effects/elitebonusinterdictorsshtrof1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Eris
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
\ No newline at end of file
+                                  "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/elitebonusjumpfreighterarmorhp1.py b/eos/effects/elitebonusjumpfreighterarmorhp1.py
index 97d53e9b79..ecfe3e25a9 100644
--- a/eos/effects/elitebonusjumpfreighterarmorhp1.py
+++ b/eos/effects/elitebonusjumpfreighterarmorhp1.py
@@ -4,5 +4,7 @@
 # Ship: Anshar
 # Ship: Ark
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/elitebonusjumpfreighterhullhp1.py b/eos/effects/elitebonusjumpfreighterhullhp1.py
index db20223b0f..df631889f7 100644
--- a/eos/effects/elitebonusjumpfreighterhullhp1.py
+++ b/eos/effects/elitebonusjumpfreighterhullhp1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ships from group: Jump Freighter (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("hp", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py b/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py
index 9d241d1765..811dc77700 100644
--- a/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py
+++ b/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Jump Freighter (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2"), skill="Jump Freighters")
+    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2"),
+                           skill="Jump Freighters")
diff --git a/eos/effects/elitebonusjumpfreightershieldhp1.py b/eos/effects/elitebonusjumpfreightershieldhp1.py
index fc36cdd0d3..7fa8469750 100644
--- a/eos/effects/elitebonusjumpfreightershieldhp1.py
+++ b/eos/effects/elitebonusjumpfreightershieldhp1.py
@@ -4,5 +4,8 @@
 # Ship: Nomad
 # Ship: Rhea
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
+    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"),
+                           skill="Jump Freighters")
diff --git a/eos/effects/elitebonuslogifrigarmorhp2.py b/eos/effects/elitebonuslogifrigarmorhp2.py
index ec7b571216..99453cb573 100644
--- a/eos/effects/elitebonuslogifrigarmorhp2.py
+++ b/eos/effects/elitebonuslogifrigarmorhp2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Deacon
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
index b3511a4136..ceb9a3d096 100644
--- a/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
+++ b/eos/effects/elitebonuslogifrigarmorrepspeedcap1.py
@@ -4,6 +4,10 @@
 # Ship: Deacon
 # Ship: Thalia
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration",
+                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigshieldhp2.py b/eos/effects/elitebonuslogifrigshieldhp2.py
index 860a8041fc..b99cde37fb 100644
--- a/eos/effects/elitebonuslogifrigshieldhp2.py
+++ b/eos/effects/elitebonuslogifrigshieldhp2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Kirin
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
index 15ccd7096c..8f2e8b53d5 100644
--- a/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
+++ b/eos/effects/elitebonuslogifrigshieldrepspeedcap1.py
@@ -4,6 +4,10 @@
 # Ship: Kirin
 # Ship: Scalpel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration",
+                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogifrigsignature2.py b/eos/effects/elitebonuslogifrigsignature2.py
index 9afe9b1f05..3f4de996a3 100644
--- a/eos/effects/elitebonuslogifrigsignature2.py
+++ b/eos/effects/elitebonuslogifrigsignature2.py
@@ -4,5 +4,8 @@
 # Ship: Scalpel
 # Ship: Thalia
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
+    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"),
+                           skill="Logistics Frigates")
diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed1.py b/eos/effects/elitebonuslogisticenergytransfercapneed1.py
index 88d7eabb4a..14d95aae6a 100644
--- a/eos/effects/elitebonuslogisticenergytransfercapneed1.py
+++ b/eos/effects/elitebonuslogisticenergytransfercapneed1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed2.py b/eos/effects/elitebonuslogisticenergytransfercapneed2.py
index 1c0760ea6c..a18cb0a34b 100644
--- a/eos/effects/elitebonuslogisticenergytransfercapneed2.py
+++ b/eos/effects/elitebonuslogisticenergytransfercapneed2.py
@@ -4,6 +4,9 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
index f92fc8c871..2c954a5027 100644
--- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
+++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
index 283490e878..3cf00747a2 100644
--- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
+++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
index d8bdb54419..3060ef3beb 100644
--- a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
+++ b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py
@@ -4,5 +4,8 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
index 4acb6ef52a..81b94ee960 100644
--- a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
+++ b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py
index 55d0519cac..b1c5b908df 100644
--- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py
+++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py
index 108e1aa497..e13cef64b8 100644
--- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py
+++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py
index df9ebe8e4f..87225755eb 100644
--- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py
+++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py
index 80434490a2..f95e79062d 100644
--- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py
+++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py
index 22a21a78fe..dcb3c5d3ad 100644
--- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py
+++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py
index 9b1c659b9a..b79d6faf06 100644
--- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py
+++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
index 16729828f7..0541914fc7 100644
--- a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
+++ b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py
@@ -3,8 +3,11 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
+            "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
index 79a74f96e5..81a99b02c9 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
index 0e928f96dd..3bffe8e415 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "explosiveDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
index 8b2a9949db..68646cd8d9 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "kineticDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
index cb5f310655..70abcb387d 100644
--- a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
+++ b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "thermalDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusmaraudershieldbonus2a.py b/eos/effects/elitebonusmaraudershieldbonus2a.py
index 5e14681d56..4856571cf4 100644
--- a/eos/effects/elitebonusmaraudershieldbonus2a.py
+++ b/eos/effects/elitebonusmaraudershieldbonus2a.py
@@ -4,6 +4,8 @@
 # Ship: Golem
 # Ship: Vargur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders")
diff --git a/eos/effects/elitebonusvampiredrainamount2.py b/eos/effects/elitebonusvampiredrainamount2.py
index 267e5c7d73..8fb5bac493 100644
--- a/eos/effects/elitebonusvampiredrainamount2.py
+++ b/eos/effects/elitebonusvampiredrainamount2.py
@@ -4,6 +4,9 @@
 # Ship: Curse
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitebonusviolatorsewtargetpainting1.py b/eos/effects/elitebonusviolatorsewtargetpainting1.py
index a6ba7f86e1..cf16508e56 100644
--- a/eos/effects/elitebonusviolatorsewtargetpainting1.py
+++ b/eos/effects/elitebonusviolatorsewtargetpainting1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1"),
+                                  skill="Marauders")
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
index dc7c316ef1..fd2aad0bb0 100644
--- a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
+++ b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Paladin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1"),
+                                  skill="Marauders")
diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
index cee1f5fe14..9b25bb56f4 100644
--- a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Paladin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
index ade06d1a07..932faef41b 100644
--- a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Kronos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
index 2f0acdf46e..da791d4573 100644
--- a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
+++ b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Kronos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
index 79cf55663d..b0166442e0 100644
--- a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
+++ b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vargur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
index 474e61091c..708c6098ce 100644
--- a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
+++ b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vargur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
index 4a82b6f142..648b652034 100644
--- a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
+++ b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py
@@ -4,6 +4,9 @@
 # Ship: Kronos
 # Ship: Paladin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2"),
+                                  skill="Marauders")
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
index 724b59f759..e6e49cbd32 100644
--- a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
+++ b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Marauder (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
                                   "maxRange", ship.getModifiedItemAttr("eliteBonusViolatorsRole2"))
diff --git a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
index 6985e955ea..747b01bb93 100644
--- a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
+++ b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Marauder (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
                                   "maxTractorVelocity", ship.getModifiedItemAttr("eliteBonusViolatorsRole3"))
diff --git a/eos/effects/eliteindustrialabheatbonus.py b/eos/effects/eliteindustrialabheatbonus.py
index b93a3bdd4c..2bfd6fe21f 100644
--- a/eos/effects/eliteindustrialabheatbonus.py
+++ b/eos/effects/eliteindustrialabheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialarmorhardenerheatbonus.py b/eos/effects/eliteindustrialarmorhardenerheatbonus.py
index c74846779e..c0e4dec0ce 100644
--- a/eos/effects/eliteindustrialarmorhardenerheatbonus.py
+++ b/eos/effects/eliteindustrialarmorhardenerheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
                                   "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialarmorrepairheatbonus.py b/eos/effects/eliteindustrialarmorrepairheatbonus.py
index 9f9ef0327a..5bb6ac8c6d 100644
--- a/eos/effects/eliteindustrialarmorrepairheatbonus.py
+++ b/eos/effects/eliteindustrialarmorrepairheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "overloadArmorDamageAmount", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialarmorresists2.py b/eos/effects/eliteindustrialarmorresists2.py
index a2fd87a86e..fc42985902 100644
--- a/eos/effects/eliteindustrialarmorresists2.py
+++ b/eos/effects/eliteindustrialarmorresists2.py
@@ -4,6 +4,8 @@
 # Ship: Impel
 # Ship: Occator
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("armor{}DamageResonance".format(damageType.capitalize()),
diff --git a/eos/effects/eliteindustrialfleetcapacity1.py b/eos/effects/eliteindustrialfleetcapacity1.py
index 717be0d22e..1cc16aab28 100644
--- a/eos/effects/eliteindustrialfleetcapacity1.py
+++ b/eos/effects/eliteindustrialfleetcapacity1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1"), skill="Transport Ships")
+    fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
+                           skill="Transport Ships")
diff --git a/eos/effects/eliteindustrialmwdheatbonus.py b/eos/effects/eliteindustrialmwdheatbonus.py
index 8b839dd389..995b34fd8b 100644
--- a/eos/effects/eliteindustrialmwdheatbonus.py
+++ b/eos/effects/eliteindustrialmwdheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
                                   "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py b/eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py
index a389cff452..7a7b3de706 100644
--- a/eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py
+++ b/eos/effects/eliteindustrialreactivearmorhardenerheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
                                   "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialshieldboosterheatbonus.py b/eos/effects/eliteindustrialshieldboosterheatbonus.py
index db9f81b407..73766a8a89 100644
--- a/eos/effects/eliteindustrialshieldboosterheatbonus.py
+++ b/eos/effects/eliteindustrialshieldboosterheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "overloadShieldBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialshieldhardenerheatbonus.py b/eos/effects/eliteindustrialshieldhardenerheatbonus.py
index c9932bf631..a90f769ac9 100644
--- a/eos/effects/eliteindustrialshieldhardenerheatbonus.py
+++ b/eos/effects/eliteindustrialshieldhardenerheatbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Deep Space Transport (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"),
                                   "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/eliteindustrialshieldresists2.py b/eos/effects/eliteindustrialshieldresists2.py
index 923855efe4..c21754443e 100644
--- a/eos/effects/eliteindustrialshieldresists2.py
+++ b/eos/effects/eliteindustrialshieldresists2.py
@@ -4,6 +4,8 @@
 # Ship: Bustard
 # Ship: Mastodon
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
diff --git a/eos/effects/eliteindustrialwarpspeedbonus1.py b/eos/effects/eliteindustrialwarpspeedbonus1.py
index e4e2456f43..826ff22ec3 100644
--- a/eos/effects/eliteindustrialwarpspeedbonus1.py
+++ b/eos/effects/eliteindustrialwarpspeedbonus1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Blockade Runner (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1"), skill="Transport Ships")
+    fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
+                           skill="Transport Ships")
diff --git a/eos/effects/elitereconbonusenergyneutamount2.py b/eos/effects/elitereconbonusenergyneutamount2.py
index ddbf0af85e..a7051eb629 100644
--- a/eos/effects/elitereconbonusenergyneutamount2.py
+++ b/eos/effects/elitereconbonusenergyneutamount2.py
@@ -4,6 +4,9 @@
 # Ship: Curse
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusgravimetricstrength2.py b/eos/effects/elitereconbonusgravimetricstrength2.py
index bd24450e98..a023201daa 100644
--- a/eos/effects/elitereconbonusgravimetricstrength2.py
+++ b/eos/effects/elitereconbonusgravimetricstrength2.py
@@ -5,6 +5,9 @@
 # Ship: Falcon
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusheavyassaultmissilevelocity.py b/eos/effects/elitereconbonusheavyassaultmissilevelocity.py
index 539bc49953..fc223a167b 100644
--- a/eos/effects/elitereconbonusheavyassaultmissilevelocity.py
+++ b/eos/effects/elitereconbonusheavyassaultmissilevelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
+                                    skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusheavymissilevelocity.py b/eos/effects/elitereconbonusheavymissilevelocity.py
index 2d41b55690..8f73c136aa 100644
--- a/eos/effects/elitereconbonusheavymissilevelocity.py
+++ b/eos/effects/elitereconbonusheavymissilevelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
+                                    skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusladarstrength2.py b/eos/effects/elitereconbonusladarstrength2.py
index b530f6b7b7..3bab26dfad 100644
--- a/eos/effects/elitereconbonusladarstrength2.py
+++ b/eos/effects/elitereconbonusladarstrength2.py
@@ -5,6 +5,9 @@
 # Ship: Falcon
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusmagnetometricstrength2.py b/eos/effects/elitereconbonusmagnetometricstrength2.py
index 5bedc18212..89baa4a807 100644
--- a/eos/effects/elitereconbonusmagnetometricstrength2.py
+++ b/eos/effects/elitereconbonusmagnetometricstrength2.py
@@ -5,6 +5,9 @@
 # Ship: Falcon
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusmhtoptimalrange1.py b/eos/effects/elitereconbonusmhtoptimalrange1.py
index 0d7d063913..921c8d7d2d 100644
--- a/eos/effects/elitereconbonusmhtoptimalrange1.py
+++ b/eos/effects/elitereconbonusmhtoptimalrange1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Lachesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusmptdamage1.py b/eos/effects/elitereconbonusmptdamage1.py
index cf0909b323..7d66fc0c54 100644
--- a/eos/effects/elitereconbonusmptdamage1.py
+++ b/eos/effects/elitereconbonusmptdamage1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Huginn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusradarstrength2.py b/eos/effects/elitereconbonusradarstrength2.py
index 78566d3c22..fec2c94907 100644
--- a/eos/effects/elitereconbonusradarstrength2.py
+++ b/eos/effects/elitereconbonusradarstrength2.py
@@ -5,6 +5,9 @@
 # Ship: Falcon
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+                                  "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
+                                  skill="Recon Ships")
diff --git a/eos/effects/elitereconjumpscramblerrangebonus2.py b/eos/effects/elitereconjumpscramblerrangebonus2.py
index 760164db82..b9bebe9a9a 100644
--- a/eos/effects/elitereconjumpscramblerrangebonus2.py
+++ b/eos/effects/elitereconjumpscramblerrangebonus2.py
@@ -4,6 +4,8 @@
 # Ship: Arazu
 # Ship: Lachesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
                                   "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/elitereconstasiswebbonus2.py b/eos/effects/elitereconstasiswebbonus2.py
index a36bef9de3..5cbfad54b5 100644
--- a/eos/effects/elitereconstasiswebbonus2.py
+++ b/eos/effects/elitereconstasiswebbonus2.py
@@ -5,6 +5,8 @@
 # Ship: Moracha
 # Ship: Rapier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py
index 148addf220..26e4531727 100644
--- a/eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py
+++ b/eos/effects/emarmorcompensationhardeningbonusgrouparmorcoating.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: EM Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
                                   "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/emarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/emarmorcompensationhardeningbonusgroupenergized.py
index 4ebe41a20c..837cf69120 100644
--- a/eos/effects/emarmorcompensationhardeningbonusgroupenergized.py
+++ b/eos/effects/emarmorcompensationhardeningbonusgroupenergized.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: EM Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
                                   "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/empwave.py b/eos/effects/empwave.py
index 90c27e2de7..898cd270f3 100644
--- a/eos/effects/empwave.py
+++ b/eos/effects/empwave.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Smart Bomb (118 of 118)
 type = "active"
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py
index 61f79b11c3..1897388224 100644
--- a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py
+++ b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: EM Shield Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/energydestabilizationnew.py b/eos/effects/energydestabilizationnew.py
index fdde53f920..6cf82afa55 100644
--- a/eos/effects/energydestabilizationnew.py
+++ b/eos/effects/energydestabilizationnew.py
@@ -1,8 +1,12 @@
 # Not used by any item
 from eos.types import State
+
 type = "active", "projected"
+
+
 def handler(fit, src, context):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+    if "projected" in context and (
+                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         multiplier = src.amountActive if hasattr(src, "amountActive") else 1
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("duration")
diff --git a/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py b/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py
index c1466fb1ec..46d6f847e1 100644
--- a/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py
+++ b/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py
@@ -5,6 +5,8 @@
 # Modules named like: Powergrid Subroutine Maximizer (8 of 8)
 # Skill: Energy Grid Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Grid Upgrades"),
diff --git a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py
index b031f9de1a..da1896d187 100644
--- a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py
+++ b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py
@@ -8,6 +8,8 @@
 # Implant: Genolution Core Augmentation CA-1
 # Skill: Capacitor Management
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("capacitorCapacity", container.getModifiedItemAttr("capacitorCapacityBonus") * level)
diff --git a/eos/effects/energyneutralizerentity.py b/eos/effects/energyneutralizerentity.py
index 37ab5ad056..8532f49df6 100644
--- a/eos/effects/energyneutralizerentity.py
+++ b/eos/effects/energyneutralizerentity.py
@@ -3,11 +3,13 @@
 # Used by:
 # Drones from group: Energy Neutralizer Drone (3 of 3)
 from eos.types import State
+
 type = "active", "projected"
 
 
 def handler(fit, src, context):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+    if "projected" in context and (
+                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("duration")
 
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 5a58dce48a..212f05ffa8 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -3,11 +3,13 @@
 # Used by:
 # Modules from group: Energy Neutralizer (51 of 51)
 from eos.types import State
+
 type = "active", "projected"
 
 
 def handler(fit, src, context):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+    if "projected" in context and (
+                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("duration")
 
diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py
index a0a79273e5..15c7d20ff3 100644
--- a/eos/effects/energynosferatufalloff.py
+++ b/eos/effects/energynosferatufalloff.py
@@ -13,4 +13,4 @@ def handler(fit, src, context):
     if "projected" in context:
         fit.addDrain(src, time, amount, 0)
     elif "module" in context:
-        src.itemModifiedAttributes.force("capacitorNeed", -amount)
\ No newline at end of file
+        src.itemModifiedAttributes.force("capacitorNeed", -amount)
diff --git a/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py b/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py
index 13e7a0eece..6db95e742b 100644
--- a/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py
+++ b/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py
@@ -4,7 +4,9 @@
 # Implants named like: Inherent Implants 'Squire' Energy Pulse Weapons EP (6 of 6)
 # Skill: Energy Pulse Weapons
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
\ No newline at end of file
+                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py
index b9a24d95fe..991640a10e 100644
--- a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py
+++ b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py
@@ -6,6 +6,8 @@
 # Implant: Genolution Core Augmentation CA-2
 # Skill: Capacitor Systems Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("rechargeRate", container.getModifiedItemAttr("capRechargeBonus") * level)
diff --git a/eos/effects/energytransfer.py b/eos/effects/energytransfer.py
index d004628bcd..4a5ef6530d 100644
--- a/eos/effects/energytransfer.py
+++ b/eos/effects/energytransfer.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "projected", "active"
+
+
 def handler(fit, src, context):
     if "projected" in context:
         amount = src.getModifiedItemAttr("powerTransferAmount")
diff --git a/eos/effects/energytransferarraymaxrangebonus.py b/eos/effects/energytransferarraymaxrangebonus.py
index 3f1f614566..cc26638adc 100644
--- a/eos/effects/energytransferarraymaxrangebonus.py
+++ b/eos/effects/energytransferarraymaxrangebonus.py
@@ -4,6 +4,8 @@
 # Ship: Augoror
 # Ship: Osprey
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                   "maxRange", ship.getModifiedItemAttr("maxRangeBonus2"))
diff --git a/eos/effects/energytransferarraytransferamountbonus.py b/eos/effects/energytransferarraytransferamountbonus.py
index 4a158ce448..b863b95ecb 100644
--- a/eos/effects/energytransferarraytransferamountbonus.py
+++ b/eos/effects/energytransferarraytransferamountbonus.py
@@ -4,6 +4,8 @@
 # Ship: Augoror
 # Ship: Osprey
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                   "powerTransferAmount", ship.getModifiedItemAttr("energyTransferAmountBonus"))
diff --git a/eos/effects/energyweapondamagemultiply.py b/eos/effects/energyweapondamagemultiply.py
index 6e5c086eb2..e1574c7fe5 100644
--- a/eos/effects/energyweapondamagemultiply.py
+++ b/eos/effects/energyweapondamagemultiply.py
@@ -5,7 +5,9 @@
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
                                      "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/energyweapondamagemultiplypassive.py b/eos/effects/energyweapondamagemultiplypassive.py
index 69efbbe1f8..5e4cad460d 100644
--- a/eos/effects/energyweapondamagemultiplypassive.py
+++ b/eos/effects/energyweapondamagemultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Energy Collision Accelerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
                                      "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/energyweaponspeedmultiply.py b/eos/effects/energyweaponspeedmultiply.py
index b4cb22ae2d..425fb1ee12 100644
--- a/eos/effects/energyweaponspeedmultiply.py
+++ b/eos/effects/energyweaponspeedmultiply.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Heat Sink (17 of 17)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/energyweaponspeedmultiplypassive.py b/eos/effects/energyweaponspeedmultiplypassive.py
index 06de0df693..bcee87d6ba 100644
--- a/eos/effects/energyweaponspeedmultiplypassive.py
+++ b/eos/effects/energyweaponspeedmultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Energy Burst Aerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py
index 02163173df..b2767914b6 100644
--- a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py
+++ b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py
@@ -6,6 +6,8 @@
 # Implant: Genolution Core Augmentation CA-1
 # Skill: Power Grid Management
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("powerOutput", container.getModifiedItemAttr("powerEngineeringOutputBonus") * level)
diff --git a/eos/effects/entityecmfalloff.py b/eos/effects/entityecmfalloff.py
index a5cdf9ad8b..5d3ec62e92 100644
--- a/eos/effects/entityecmfalloff.py
+++ b/eos/effects/entityecmfalloff.py
@@ -3,9 +3,11 @@
 # Used by:
 # Drones named like: EC (3 of 3)
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
 
         fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/entityenergyneutralizerfalloff.py
index 342598ebf3..0783295cfe 100644
--- a/eos/effects/entityenergyneutralizerfalloff.py
+++ b/eos/effects/entityenergyneutralizerfalloff.py
@@ -3,11 +3,13 @@
 # Used by:
 # Drones from group: Energy Neutralizer Drone (3 of 3)
 from eos.types import State
+
 type = "active", "projected"
 
 
 def handler(fit, src, context):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+    if "projected" in context and (
+                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("energyNeutralizerDuration")
 
diff --git a/eos/effects/entosiscpuaddition.py b/eos/effects/entosiscpuaddition.py
index 335566d591..a29e38f853 100644
--- a/eos/effects/entosiscpuaddition.py
+++ b/eos/effects/entosiscpuaddition.py
@@ -3,6 +3,7 @@
 # Used by:
 # Modules from group: Entosis Link (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
-
diff --git a/eos/effects/entosiscpupenalty.py b/eos/effects/entosiscpupenalty.py
index 61a6175b97..a382ed70ad 100644
--- a/eos/effects/entosiscpupenalty.py
+++ b/eos/effects/entosiscpupenalty.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Interceptor (10 of 10)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
                                      "entosisCPUAdd", ship.getModifiedItemAttr("entosisCPUPenalty"))
diff --git a/eos/effects/entosisdurationmultiply.py b/eos/effects/entosisdurationmultiply.py
index a4262caa55..410ff6312f 100644
--- a/eos/effects/entosisdurationmultiply.py
+++ b/eos/effects/entosisdurationmultiply.py
@@ -8,6 +8,8 @@
 # Ships from group: Titan (5 of 5)
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
                                      "duration", ship.getModifiedItemAttr("entosisDurationMultiplier") or 1)
diff --git a/eos/effects/entosislink.py b/eos/effects/entosislink.py
index c44f426bcf..a28b8da2df 100644
--- a/eos/effects/entosislink.py
+++ b/eos/effects/entosislink.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Entosis Link (6 of 6)
 type = "active"
+
+
 def handler(fit, module, context):
     fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))
diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
index ebb16ac65a..b2f81c56eb 100644
--- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
+++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
@@ -9,7 +9,9 @@
 # Skill: Evasive Maneuvering
 # Skill: Spaceship Command
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("agility", container.getModifiedItemAttr("agilityBonus") * level,
-                           stackingPenalties = "skill" not in context and "implant" not in context)
+                           stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/ewgroupecmburstmaxrangebonus.py b/eos/effects/ewgroupecmburstmaxrangebonus.py
index b41497d467..11c4f01cba 100644
--- a/eos/effects/ewgroupecmburstmaxrangebonus.py
+++ b/eos/effects/ewgroupecmburstmaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/ewgrouprsdmaxrangebonus.py b/eos/effects/ewgrouprsdmaxrangebonus.py
index 88ab435518..cd2c3cf5e7 100644
--- a/eos/effects/ewgrouprsdmaxrangebonus.py
+++ b/eos/effects/ewgrouprsdmaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/ewgrouptdmaxrangebonus.py
index e085e9f10a..5fcc86c66a 100644
--- a/eos/effects/ewgrouptdmaxrangebonus.py
+++ b/eos/effects/ewgrouptdmaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/ewgrouptpmaxrangebonus.py b/eos/effects/ewgrouptpmaxrangebonus.py
index 6e116c87d7..a764367c0f 100644
--- a/eos/effects/ewgrouptpmaxrangebonus.py
+++ b/eos/effects/ewgrouptpmaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/ewskillecmburstcapneedbonus.py b/eos/effects/ewskillecmburstcapneedbonus.py
index 590417e900..0e836193a9 100644
--- a/eos/effects/ewskillecmburstcapneedbonus.py
+++ b/eos/effects/ewskillecmburstcapneedbonus.py
@@ -5,6 +5,8 @@
 # Modules named like: Signal Disruption Amplifier (8 of 8)
 # Skill: Electronic Warfare
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
diff --git a/eos/effects/ewskillecmburstrangebonus.py b/eos/effects/ewskillecmburstrangebonus.py
index e2d8b39873..1f257c03c9 100644
--- a/eos/effects/ewskillecmburstrangebonus.py
+++ b/eos/effects/ewskillecmburstrangebonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
                                   "ecmBurstRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties = False if "skill" in context else True)
+                                  stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/ewskillewcapneedskilllevel.py b/eos/effects/ewskillewcapneedskilllevel.py
index 557624ed68..6b1a25c5d9 100644
--- a/eos/effects/ewskillewcapneedskilllevel.py
+++ b/eos/effects/ewskillewcapneedskilllevel.py
@@ -5,6 +5,8 @@
 # Modules named like: Signal Disruption Amplifier (8 of 8)
 # Skill: Electronic Warfare
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
diff --git a/eos/effects/ewskillewfalloffbonus.py b/eos/effects/ewskillewfalloffbonus.py
index 839f16faa2..931a640f62 100644
--- a/eos/effects/ewskillewfalloffbonus.py
+++ b/eos/effects/ewskillewfalloffbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Frequency Modulation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/ewskillewmaxrangebonus.py b/eos/effects/ewskillewmaxrangebonus.py
index c161f7060e..68cbc4d835 100644
--- a/eos/effects/ewskillewmaxrangebonus.py
+++ b/eos/effects/ewskillewmaxrangebonus.py
@@ -5,8 +5,10 @@
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties = "skill" not in context and "implant" not in context)
+                                  stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/ewskillguidancedisruptionbonus.py b/eos/effects/ewskillguidancedisruptionbonus.py
index 7348e304b5..71c4a3dc9c 100644
--- a/eos/effects/ewskillguidancedisruptionbonus.py
+++ b/eos/effects/ewskillguidancedisruptionbonus.py
@@ -4,13 +4,15 @@
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
 # Skill: Weapon Destabilization
 type = "passive"
+
+
 def handler(fit, src, context):
     level = src.level if "skill" in context else 1
     for attr in (
-        "explosionDelayBonus",
-        "aoeVelocityBonus",
-        "aoeCloudSizeBonus",
-        "missileVelocityBonus"
+            "explosionDelayBonus",
+            "aoeVelocityBonus",
+            "aoeCloudSizeBonus",
+            "missileVelocityBonus"
     ):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
\ No newline at end of file
+                                      attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/ewskillrsdcapneedbonusskilllevel.py b/eos/effects/ewskillrsdcapneedbonusskilllevel.py
index b9c503a5fc..e7f0f80cb8 100644
--- a/eos/effects/ewskillrsdcapneedbonusskilllevel.py
+++ b/eos/effects/ewskillrsdcapneedbonusskilllevel.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gypsy' Sensor Linking SL (6 of 6)
 # Skill: Sensor Linking
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
diff --git a/eos/effects/ewskillrsdfalloffbonus.py b/eos/effects/ewskillrsdfalloffbonus.py
index aa9ab09bdb..21ab67c211 100644
--- a/eos/effects/ewskillrsdfalloffbonus.py
+++ b/eos/effects/ewskillrsdfalloffbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Frequency Modulation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
                                   "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/ewskillrsdmaxrangebonus.py b/eos/effects/ewskillrsdmaxrangebonus.py
index 14553b1cf2..a0d8a7db7b 100644
--- a/eos/effects/ewskillrsdmaxrangebonus.py
+++ b/eos/effects/ewskillrsdmaxrangebonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties = "skill" not in context)
+                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/ewskillscanstrengthbonus.py b/eos/effects/ewskillscanstrengthbonus.py
index 52b3c6862d..1af9d30f44 100644
--- a/eos/effects/ewskillscanstrengthbonus.py
+++ b/eos/effects/ewskillscanstrengthbonus.py
@@ -4,10 +4,13 @@
 # Modules named like: Particle Dispersion Augmentor (8 of 8)
 # Skill: Signal Dispersion
 type = "passive"
+
+
 def handler(fit, container, context):
     groups = ("ECM", "Burst Jammer")
     level = container.level if "skill" in context else 1
     for scanType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      "scan{0}StrengthBonus".format(scanType), container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                      stackingPenalties = False if "skill" in context else True)
+                                      "scan{0}StrengthBonus".format(scanType),
+                                      container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
+                                      stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py b/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py
index 76b99b8876..534c3af7ae 100644
--- a/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py
+++ b/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py
@@ -4,7 +4,10 @@
 # Modules named like: Inverted Signal Field Projector (8 of 8)
 # Skill: Signal Suppression
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
+                                  "maxTargetRangeBonus",
+                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py b/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py
index 8edf1e5e79..0f218ec695 100644
--- a/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py
+++ b/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py
@@ -4,9 +4,12 @@
 # Modules named like: Inverted Signal Field Projector (8 of 8)
 # Skill: Signal Suppression
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalized = False if "skill" in context else True
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
+                                  "scanResolutionBonus",
+                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
                                   stackingPenalties=penalized)
diff --git a/eos/effects/ewskilltargetpaintingstrengthbonus.py b/eos/effects/ewskilltargetpaintingstrengthbonus.py
index ec17309538..bf1267d779 100644
--- a/eos/effects/ewskilltargetpaintingstrengthbonus.py
+++ b/eos/effects/ewskilltargetpaintingstrengthbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Signature Focusing
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", skill.getModifiedItemAttr("scanSkillTargetPaintStrengthBonus") * skill.level)
\ No newline at end of file
+                                  "signatureRadiusBonus",
+                                  skill.getModifiedItemAttr("scanSkillTargetPaintStrengthBonus") * skill.level)
diff --git a/eos/effects/ewskilltdcapneedbonusskilllevel.py b/eos/effects/ewskilltdcapneedbonusskilllevel.py
index 217f84bdec..88e0843612 100644
--- a/eos/effects/ewskilltdcapneedbonusskilllevel.py
+++ b/eos/effects/ewskilltdcapneedbonusskilllevel.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gypsy' Weapon Disruption WD (6 of 6)
 # Skill: Weapon Disruption
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
diff --git a/eos/effects/ewskilltdfalloffbonus.py b/eos/effects/ewskilltdfalloffbonus.py
index 9951a09e8e..6b1490fc64 100644
--- a/eos/effects/ewskilltdfalloffbonus.py
+++ b/eos/effects/ewskilltdfalloffbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Frequency Modulation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/ewskilltdmaxrangebonus.py b/eos/effects/ewskilltdmaxrangebonus.py
index 03f87118a5..1ed5b55d57 100644
--- a/eos/effects/ewskilltdmaxrangebonus.py
+++ b/eos/effects/ewskilltdmaxrangebonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties = "skill" not in context)
+                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/ewskilltpcapneedbonusskilllevel.py b/eos/effects/ewskilltpcapneedbonusskilllevel.py
index 495e99ebde..720cea4511 100644
--- a/eos/effects/ewskilltpcapneedbonusskilllevel.py
+++ b/eos/effects/ewskilltpcapneedbonusskilllevel.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gypsy' Target Painting TG (6 of 6)
 # Skill: Target Painting
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
diff --git a/eos/effects/ewskilltpfalloffbonus.py b/eos/effects/ewskilltpfalloffbonus.py
index 2ebb5d98d5..38eebe10af 100644
--- a/eos/effects/ewskilltpfalloffbonus.py
+++ b/eos/effects/ewskilltpfalloffbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Frequency Modulation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
                                   "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/ewskilltpmaxrangebonus.py b/eos/effects/ewskilltpmaxrangebonus.py
index c449a6d1a0..901d4c45b7 100644
--- a/eos/effects/ewskilltpmaxrangebonus.py
+++ b/eos/effects/ewskilltpmaxrangebonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Particle Dispersion Projector (8 of 8)
 # Skill: Long Distance Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties = "skill" not in context)
+                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
index 461702874c..fbd6ae8af8 100644
--- a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
+++ b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
 # Skill: Weapon Destabilization
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     for attr in ("maxRangeBonus", "falloffBonus"):
diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
index 8327699cdb..6a532270dc 100644
--- a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
+++ b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
@@ -4,7 +4,10 @@
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
 # Skill: Weapon Destabilization
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "trackingSpeedBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
+                                  "trackingSpeedBonus",
+                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/ewtargetpaint.py b/eos/effects/ewtargetpaint.py
index 4be80da74b..c61adeb8b5 100644
--- a/eos/effects/ewtargetpaint.py
+++ b/eos/effects/ewtargetpaint.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/ewtesteffectjam.py b/eos/effects/ewtesteffectjam.py
index e3863a3e73..45a9f9c262 100644
--- a/eos/effects/ewtesteffectjam.py
+++ b/eos/effects/ewtesteffectjam.py
@@ -3,9 +3,11 @@
 # Used by:
 # Drones named like: EC (3 of 3)
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
 
         fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
index c4a9204d18..65889bd4d8 100644
--- a/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
+++ b/eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Endurance
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
+                                  src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
diff --git a/eos/effects/expeditionfrigateshieldresistance1.py b/eos/effects/expeditionfrigateshieldresistance1.py
index 404e2c0721..ff05639dcc 100644
--- a/eos/effects/expeditionfrigateshieldresistance1.py
+++ b/eos/effects/expeditionfrigateshieldresistance1.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Endurance
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
+                           skill="Expedition Frigates")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
+                           skill="Expedition Frigates")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
+                           skill="Expedition Frigates")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
+                           skill="Expedition Frigates")
diff --git a/eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py
index ea659537bc..05511b42f4 100644
--- a/eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py
+++ b/eos/effects/explosivearmorcompensationhardeningbonusgrouparmorcoating.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Explosive Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "explosiveDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "explosiveDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py b/eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py
index 94de318c70..556cbb7f23 100644
--- a/eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py
+++ b/eos/effects/explosivearmorcompensationhardeningbonusgroupenergized.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Explosive Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "explosiveDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "explosiveDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py
index 3703083d17..332ccae6ef 100644
--- a/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py
+++ b/eos/effects/explosiveshieldcompensationhardeningbonusgroupshieldamp.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Explosive Shield Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "explosiveDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "explosiveDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/falloffbonuseffecthybrids.py b/eos/effects/falloffbonuseffecthybrids.py
index d9f8d9e23a..94f3ab90b8 100644
--- a/eos/effects/falloffbonuseffecthybrids.py
+++ b/eos/effects/falloffbonuseffecthybrids.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Hybrid Ambit Extension (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                   "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/falloffbonuseffectlasers.py b/eos/effects/falloffbonuseffectlasers.py
index 47bb6e6d06..dd5838c5a2 100644
--- a/eos/effects/falloffbonuseffectlasers.py
+++ b/eos/effects/falloffbonuseffectlasers.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Energy Ambit Extension (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
                                   "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/falloffbonuseffectprojectiles.py b/eos/effects/falloffbonuseffectprojectiles.py
index 5a2f4b45a0..0de580e189 100644
--- a/eos/effects/falloffbonuseffectprojectiles.py
+++ b/eos/effects/falloffbonuseffectprojectiles.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Projectile Ambit Extension (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
                                   "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/federationsetbonus3.py
index b97317b82d..f73c4d6afb 100644
--- a/eos/effects/federationsetbonus3.py
+++ b/eos/effects/federationsetbonus3.py
@@ -4,6 +4,9 @@
 # Implants named like: High grade Spur (6 of 6)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy"))
+                                             "scanMagnetometricStrengthPercent",
+                                             implant.getModifiedItemAttr("implantSetFederationNavy"))
diff --git a/eos/effects/federationsetlgbonus.py b/eos/effects/federationsetlgbonus.py
index 4328417cd1..a393582bae 100644
--- a/eos/effects/federationsetlgbonus.py
+++ b/eos/effects/federationsetlgbonus.py
@@ -4,6 +4,9 @@
 # Implants named like: Low grade Spur (6 of 6)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanMagnetometricStrengthModifier", implant.getModifiedItemAttr("implantSetLGFederationNavy"))
+                                             "scanMagnetometricStrengthModifier",
+                                             implant.getModifiedItemAttr("implantSetLGFederationNavy"))
diff --git a/eos/effects/fighterabilityattackm.py b/eos/effects/fighterabilityattackm.py
index d2d14119c6..2ea0028196 100644
--- a/eos/effects/fighterabilityattackm.py
+++ b/eos/effects/fighterabilityattackm.py
@@ -11,5 +11,6 @@
 
 type = "active"
 
+
 def handler(fit, src, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/fighterabilityecm.py b/eos/effects/fighterabilityecm.py
index c18825aad7..743df38ed3 100644
--- a/eos/effects/fighterabilityecm.py
+++ b/eos/effects/fighterabilityecm.py
@@ -3,7 +3,6 @@
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
 """
-from eos.types import State
 
 # User-friendly name for the ability
 displayName = "ECM"
@@ -11,9 +10,12 @@
 prefix = "fighterAbilityECM"
 
 type = "projected", "active"
+
+
 def handler(fit, module, context):
-    if "projected" not in context: return
+    if "projected" not in context:
+        return
     # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-    strModifier = 1 - module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType))/fit.scanStrength
+    strModifier = 1 - module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType)) / fit.scanStrength
 
     fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/fighterabilityenergyneutralizer.py b/eos/effects/fighterabilityenergyneutralizer.py
index bad275c32f..dd771b7504 100644
--- a/eos/effects/fighterabilityenergyneutralizer.py
+++ b/eos/effects/fighterabilityenergyneutralizer.py
@@ -14,4 +14,4 @@ def handler(fit, src, context):
         amount = src.getModifiedItemAttr("{}Amount".format(prefix))
         time = src.getModifiedItemAttr("{}Duration".format(prefix))
 
-        fit.addDrain(src, time, amount, 0)
\ No newline at end of file
+        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/fighterabilityevasivemaneuvers.py b/eos/effects/fighterabilityevasivemaneuvers.py
index 19af7030fb..bf17edc924 100644
--- a/eos/effects/fighterabilityevasivemaneuvers.py
+++ b/eos/effects/fighterabilityevasivemaneuvers.py
@@ -13,12 +13,25 @@
 
 type = "active"
 runTime = "late"
-def handler(fit, module, context):
-    module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversSpeedBonus"))
-    module.boostItemAttr("signatureRadius", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversSignatureRadiusBonus"), stackingPenalties = True)
-    
-	# These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
-    module.multiplyItemAttr("shieldEmDamageResonance", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversEmResonance"), stackingPenalties = True)
-    module.multiplyItemAttr("shieldThermalDamageResonance", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversThermResonance"), stackingPenalties = True)
-    module.multiplyItemAttr("shieldKineticDamageResonance", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversKinResonance"), stackingPenalties = True)
-    module.multiplyItemAttr("shieldExplosiveDamageResonance", module.getModifiedItemAttr("fighterAbilityEvasiveManeuversExpResonance"), stackingPenalties = True)
\ No newline at end of file
+
+
+def handler(fit, container, context):
+    container.boostItemAttr("maxVelocity",
+                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSpeedBonus"))
+    container.boostItemAttr("signatureRadius",
+                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSignatureRadiusBonus"),
+                            stackingPenalties=True)
+
+    # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
+    container.multiplyItemAttr("shieldEmDamageResonance",
+                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversEmResonance"),
+                               stackingPenalties=True)
+    container.multiplyItemAttr("shieldThermalDamageResonance",
+                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversThermResonance"),
+                               stackingPenalties=True)
+    container.multiplyItemAttr("shieldKineticDamageResonance",
+                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversKinResonance"),
+                               stackingPenalties=True)
+    container.multiplyItemAttr("shieldExplosiveDamageResonance",
+                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversExpResonance"),
+                               stackingPenalties=True)
diff --git a/eos/effects/fighterabilitylaunchbomb.py b/eos/effects/fighterabilitylaunchbomb.py
index bc76f2a191..bd46513bfb 100644
--- a/eos/effects/fighterabilitylaunchbomb.py
+++ b/eos/effects/fighterabilitylaunchbomb.py
@@ -14,5 +14,6 @@
 # This flag is required for effects that use charges in order to properly calculate reload time
 hasCharges = True
 
+
 def handler(fit, src, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/fighterabilitymicrowarpdrive.py b/eos/effects/fighterabilitymicrowarpdrive.py
index 9e2303ec4c..01bea209ac 100644
--- a/eos/effects/fighterabilitymicrowarpdrive.py
+++ b/eos/effects/fighterabilitymicrowarpdrive.py
@@ -11,6 +11,10 @@
 
 type = "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSpeedBonus"))
-    module.boostItemAttr("signatureRadius", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSignatureRadiusBonus"), stackingPenalties = True)
\ No newline at end of file
+    module.boostItemAttr("signatureRadius",
+                         module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSignatureRadiusBonus"),
+                         stackingPenalties=True)
diff --git a/eos/effects/fighterabilitymissiles.py b/eos/effects/fighterabilitymissiles.py
index c002ea5ace..8dc752ee29 100644
--- a/eos/effects/fighterabilitymissiles.py
+++ b/eos/effects/fighterabilitymissiles.py
@@ -14,5 +14,6 @@
 # This flag is required for effects that use charges in order to properly calculate reload time
 hasCharges = True
 
+
 def handler(fit, src, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/fighterabilitystasiswebifier.py b/eos/effects/fighterabilitystasiswebifier.py
index f067859bc4..cf5143f98f 100644
--- a/eos/effects/fighterabilitystasiswebifier.py
+++ b/eos/effects/fighterabilitystasiswebifier.py
@@ -3,7 +3,6 @@
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
 """
-from eos.types import State
 
 # User-friendly name for the ability
 displayName = "Stasis Webifier"
@@ -12,6 +11,8 @@
 
 type = "active", "projected"
 
+
 def handler(fit, src, context):
-    if "projected" not in context: return
+    if "projected" not in context:
+        return
     fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)))
diff --git a/eos/effects/fighterabilitywarpdisruption.py b/eos/effects/fighterabilitywarpdisruption.py
index b0e0c281d5..0d70134341 100644
--- a/eos/effects/fighterabilitywarpdisruption.py
+++ b/eos/effects/fighterabilitywarpdisruption.py
@@ -3,15 +3,14 @@
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
 """
-from eos.types import State
 
 # User-friendly name for the ability
 displayName = "Warp Disruption"
-
 prefix = "fighterAbilityWarpDisruption"
-
 type = "active", "projected"
 
+
 def handler(fit, src, context):
-    if "projected" not in context: return
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)))
\ No newline at end of file
+    if "projected" not in context:
+        return
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)))
diff --git a/eos/effects/fightersdmgbonusskills.py b/eos/effects/fightersdmgbonusskills.py
index 8f67ce9160..8a61c85e06 100644
--- a/eos/effects/fightersdmgbonusskills.py
+++ b/eos/effects/fightersdmgbonusskills.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Fighters
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                 "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/flagshipmultirelayeffect.py b/eos/effects/flagshipmultirelayeffect.py
index b62ac62820..17cdd48e42 100644
--- a/eos/effects/flagshipmultirelayeffect.py
+++ b/eos/effects/flagshipmultirelayeffect.py
@@ -3,10 +3,12 @@
 # Used by:
 # Module: Command Processor I
 type = "passive"
+
+
 def handler(fit, module, context):
-    #Note: we increase maxGroupActive by two.
-    #If we only increased it by one, we'd get the number to stay equal
-    #As Comman Processors use one themselves too
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator" and \
-                                     "maxGroupActive" in mod.itemModifiedAttributes,
+    # Note: we increase maxGroupActive by two.
+    # If we only increased it by one, we'd get the number to stay equal
+    # As Comman Processors use one themselves too
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator" and
+                                                 "maxGroupActive" in mod.itemModifiedAttributes,
                                      "maxGroupActive", 1)
diff --git a/eos/effects/freighteragilitybonus2o2.py b/eos/effects/freighteragilitybonus2o2.py
index 5a990918e7..740a25522e 100644
--- a/eos/effects/freighteragilitybonus2o2.py
+++ b/eos/effects/freighteragilitybonus2o2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bowhead
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1"), skill="ORE Freighter")
+    fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1"),
+                           skill="ORE Freighter")
diff --git a/eos/effects/freighteragilitybonusa1.py b/eos/effects/freighteragilitybonusa1.py
index 2595d7d857..8aa4fa8229 100644
--- a/eos/effects/freighteragilitybonusa1.py
+++ b/eos/effects/freighteragilitybonusa1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Ark
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/freighteragilitybonusc1.py b/eos/effects/freighteragilitybonusc1.py
index 157b2a432a..02d6f9eaef 100644
--- a/eos/effects/freighteragilitybonusc1.py
+++ b/eos/effects/freighteragilitybonusc1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Rhea
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/freighteragilitybonusg1.py b/eos/effects/freighteragilitybonusg1.py
index f68d099f7a..54f7e1a620 100644
--- a/eos/effects/freighteragilitybonusg1.py
+++ b/eos/effects/freighteragilitybonusg1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Anshar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/freighteragilitybonusm1.py b/eos/effects/freighteragilitybonusm1.py
index 999ac61b90..99100cf31b 100644
--- a/eos/effects/freighteragilitybonusm1.py
+++ b/eos/effects/freighteragilitybonusm1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Nomad
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/freightercargobonusa2.py b/eos/effects/freightercargobonusa2.py
index 66834b2df7..beda51a4ce 100644
--- a/eos/effects/freightercargobonusa2.py
+++ b/eos/effects/freightercargobonusa2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Providence (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusA2"), skill="Amarr Freighter")
diff --git a/eos/effects/freightercargobonusc2.py b/eos/effects/freightercargobonusc2.py
index d024c2c540..35085c886a 100644
--- a/eos/effects/freightercargobonusc2.py
+++ b/eos/effects/freightercargobonusc2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Charon (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusC2"), skill="Caldari Freighter")
diff --git a/eos/effects/freightercargobonusg2.py b/eos/effects/freightercargobonusg2.py
index 43c5bb04b0..4b4807871a 100644
--- a/eos/effects/freightercargobonusg2.py
+++ b/eos/effects/freightercargobonusg2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Obelisk (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusG2"), skill="Gallente Freighter")
diff --git a/eos/effects/freightercargobonusm2.py b/eos/effects/freightercargobonusm2.py
index 5b8ed9fd80..ee616cb538 100644
--- a/eos/effects/freightercargobonusm2.py
+++ b/eos/effects/freightercargobonusm2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Fenrir (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusM2"), skill="Minmatar Freighter")
diff --git a/eos/effects/freightermaxvelocitybonusa1.py b/eos/effects/freightermaxvelocitybonusa1.py
index 70d2e724ce..0842ef288d 100644
--- a/eos/effects/freightermaxvelocitybonusa1.py
+++ b/eos/effects/freightermaxvelocitybonusa1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Providence
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/freightermaxvelocitybonusc1.py b/eos/effects/freightermaxvelocitybonusc1.py
index 219e7ea8b5..e81e55459c 100644
--- a/eos/effects/freightermaxvelocitybonusc1.py
+++ b/eos/effects/freightermaxvelocitybonusc1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Charon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/freightermaxvelocitybonusg1.py b/eos/effects/freightermaxvelocitybonusg1.py
index 83d5a3bced..4fc3f48446 100644
--- a/eos/effects/freightermaxvelocitybonusg1.py
+++ b/eos/effects/freightermaxvelocitybonusg1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Obelisk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/freightermaxvelocitybonusm1.py b/eos/effects/freightermaxvelocitybonusm1.py
index 7adad4fc66..497d0797fc 100644
--- a/eos/effects/freightermaxvelocitybonusm1.py
+++ b/eos/effects/freightermaxvelocitybonusm1.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Fenrir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/freightersmacapacitybonuso1.py b/eos/effects/freightersmacapacitybonuso1.py
index b57f862167..92df1ab367 100644
--- a/eos/effects/freightersmacapacitybonuso1.py
+++ b/eos/effects/freightersmacapacitybonuso1.py
@@ -3,7 +3,9 @@
 # Used by:
 # Ship: Bowhead
 type = "passive"
+
+
 def handler(fit, ship, context):
     # todo: stacking?
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2"), skill="ORE Freighter",
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/frequencymininglasermaxrangebonus.py b/eos/effects/frequencymininglasermaxrangebonus.py
index 7a19424d17..9285d51b84 100644
--- a/eos/effects/frequencymininglasermaxrangebonus.py
+++ b/eos/effects/frequencymininglasermaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Harvest (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Frequency Mining Laser",
                                   "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py b/eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py
index decfd16205..bdc5f52694 100644
--- a/eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py
+++ b/eos/effects/fuelconservationcapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringafterburner.py
@@ -4,6 +4,8 @@
 # Skill: Afterburner
 # Skill: Fuel Conservation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/fueledarmorrepair.py b/eos/effects/fueledarmorrepair.py
index 91f1ffc651..875a25cd2d 100644
--- a/eos/effects/fueledarmorrepair.py
+++ b/eos/effects/fueledarmorrepair.py
@@ -4,12 +4,14 @@
 # Modules from group: Ancillary Armor Repairer (4 of 4)
 runTime = "late"
 type = "active"
+
+
 def handler(fit, module, context):
     if module.charge and module.charge.name == "Nanite Repair Paste":
         multiplier = 3
     else:
         multiplier = 1
-        
+
     amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
     speed = module.getModifiedItemAttr("duration") / 1000.0
     fit.extraAttributes.increase("armorRepair", amount / speed)
diff --git a/eos/effects/fueledshieldboosting.py b/eos/effects/fueledshieldboosting.py
index da058dfd61..36db95e2c1 100644
--- a/eos/effects/fueledshieldboosting.py
+++ b/eos/effects/fueledshieldboosting.py
@@ -4,6 +4,8 @@
 # Modules from group: Ancillary Shield Booster (5 of 5)
 runTime = "late"
 type = "active"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("shieldBonus")
     speed = module.getModifiedItemAttr("duration") / 1000.0
diff --git a/eos/effects/gangabmwdfactorboost.py b/eos/effects/gangabmwdfactorboost.py
index 898d561c2c..350458eb1d 100644
--- a/eos/effects/gangabmwdfactorboost.py
+++ b/eos/effects/gangabmwdfactorboost.py
@@ -4,8 +4,11 @@
 # Variations of module: Skirmish Warfare Link - Rapid Deployment I (2 of 2)
 type = "gang", "active"
 gangBoost = "speedFactor"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "speedFactor", module.getModifiedItemAttr("commandBonus"),
                                   stackingPenalties=True)
diff --git a/eos/effects/gangarmorhardening.py b/eos/effects/gangarmorhardening.py
index 25665c8171..6390ddaa0d 100644
--- a/eos/effects/gangarmorhardening.py
+++ b/eos/effects/gangarmorhardening.py
@@ -4,9 +4,12 @@
 # Variations of module: Armored Warfare Link - Passive Defense I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorResistance"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
         fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/gangarmorrepaircapreducerselfandprojected.py b/eos/effects/gangarmorrepaircapreducerselfandprojected.py
index 89e451bca0..23ebfa8ac2 100644
--- a/eos/effects/gangarmorrepaircapreducerselfandprojected.py
+++ b/eos/effects/gangarmorrepaircapreducerselfandprojected.py
@@ -4,7 +4,11 @@
 # Variations of module: Armored Warfare Link - Damage Control I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairCapacitorNeed"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
+        "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py b/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py
index 0f94f82b0c..80c5eebe92 100644
--- a/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py
+++ b/eos/effects/gangarmorrepairspeedamplifierselfandprojected.py
@@ -4,7 +4,11 @@
 # Variations of module: Armored Warfare Link - Rapid Repair I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairDuration"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "duration", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
+        "duration", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/gangbonussignature.py b/eos/effects/gangbonussignature.py
index 31db2a2053..fa5056d8f4 100644
--- a/eos/effects/gangbonussignature.py
+++ b/eos/effects/gangbonussignature.py
@@ -4,7 +4,10 @@
 # Variations of module: Skirmish Warfare Link - Evasive Maneuvers I (2 of 2)
 type = "gang", "active"
 gangBoost = "signatureRadius"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("commandBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py b/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py
index a5729efcef..162b2a074b 100644
--- a/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py
+++ b/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py
@@ -4,10 +4,13 @@
 # Variations of module: Mining Foreman Link - Harvester Capacitor Efficiency I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningCapacitorNeed"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser",
               "Ice Harvester", "Gas Cloud Harvester")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "capacitorNeed", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py b/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py
index 1884f0fca1..2ffa231005 100644
--- a/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py
+++ b/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py
@@ -4,10 +4,13 @@
 # Variations of module: Mining Foreman Link - Laser Optimization I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningDuration"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser",
               "Ice Harvester", "Gas Cloud Harvester")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "duration", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
index b3ddcacaad..6ce5d0c402 100644
--- a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
+++ b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
@@ -4,9 +4,12 @@
 # Variations of module: Information Warfare Link - Recon Operation I (2 of 2)
 type = "gang", "active"
 gangBoost = "electronicMaxRange"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Target Painter", "Weapon Disruptor", "Sensor Dampener", "ECM", "Burst Jammer")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/ganginformationwarfaresuperiorityall2.py b/eos/effects/ganginformationwarfaresuperiorityall2.py
index da72b30f4e..6e8070e3a9 100644
--- a/eos/effects/ganginformationwarfaresuperiorityall2.py
+++ b/eos/effects/ganginformationwarfaresuperiorityall2.py
@@ -3,8 +3,10 @@
 # Used by:
 # Variations of module: Information Warfare Link - Electronic Superiority I (2 of 2)
 type = "active"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("commandBonusTD", module.getModifiedItemAttr("commandBonusHidden"))
     module.multiplyItemAttr("commandBonusECM", module.getModifiedItemAttr("commandBonusHidden"))
     module.multiplyItemAttr("commandBonusRSD", module.getModifiedItemAttr("commandBonusHidden"))
-    module.multiplyItemAttr("commandBonusTP", module.getModifiedItemAttr("commandBonusHidden"))
\ No newline at end of file
+    module.multiplyItemAttr("commandBonusTP", module.getModifiedItemAttr("commandBonusHidden"))
diff --git a/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py b/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py
index 00919eecf5..8320e6b114 100644
--- a/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py
+++ b/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py
@@ -4,10 +4,14 @@
 # Variations of module: Mining Foreman Link - Mining Laser Field Enhancement I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningMaxRange"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Mining"),
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill(
+        "Ice Harvesting") or mod.item.requiresSkill("Mining"),
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
                                   "surveyScanRange", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/gangpropulsionjammingboost.py b/eos/effects/gangpropulsionjammingboost.py
index e50376c7ac..7b400afcd3 100644
--- a/eos/effects/gangpropulsionjammingboost.py
+++ b/eos/effects/gangpropulsionjammingboost.py
@@ -4,9 +4,12 @@
 # Variations of module: Skirmish Warfare Link - Interdiction Maneuvers I (2 of 2)
 type = "gang", "active"
 gangBoost = "interdictionMaxRange"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    groups = ("Stasis Web","Warp Scrambler")
+    if "gang" not in context:
+        return
+    groups = ("Stasis Web", "Warp Scrambler")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/gangsensorintegrity.py b/eos/effects/gangsensorintegrity.py
index 9e90654b5e..e4b41c809d 100644
--- a/eos/effects/gangsensorintegrity.py
+++ b/eos/effects/gangsensorintegrity.py
@@ -5,11 +5,14 @@
 type = "gang", "active"
 gangBoost = "maxTargetRange"
 gangBonus = "commandBonus"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("commandBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
     for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"):
         fit.ship.boostItemAttr("scan%sStrength" % scanType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/gangshieldboosteandtransportercapacitorneed.py b/eos/effects/gangshieldboosteandtransportercapacitorneed.py
index 3f600e79c9..d54f6d3845 100644
--- a/eos/effects/gangshieldboosteandtransportercapacitorneed.py
+++ b/eos/effects/gangshieldboosteandtransportercapacitorneed.py
@@ -4,7 +4,11 @@
 # Variations of module: Siege Warfare Link - Shield Efficiency I (2 of 2)
 type = "gang", "active"
 gangBoost = "shieldRepairCapacitorNeed"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
+        "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/gangshieldboosterandtransporterspeed.py b/eos/effects/gangshieldboosterandtransporterspeed.py
index 7637d0a940..fa2321d2b1 100644
--- a/eos/effects/gangshieldboosterandtransporterspeed.py
+++ b/eos/effects/gangshieldboosterandtransporterspeed.py
@@ -4,7 +4,11 @@
 # Variations of module: Siege Warfare Link - Active Shielding I (2 of 2)
 type = "gang", "active"
 gangBoost = "shieldRepairDuration"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
-                                  "duration", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
+        "duration", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/gangshieldhardening.py b/eos/effects/gangshieldhardening.py
index 2c438590f9..b1bd5d449c 100644
--- a/eos/effects/gangshieldhardening.py
+++ b/eos/effects/gangshieldhardening.py
@@ -4,9 +4,12 @@
 # Variations of module: Siege Warfare Link - Shield Harmonizing I (2 of 2)
 type = "gang", "active"
 gangBoost = "shieldResistance"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for damageType in ("Em", "Explosive", "Thermal", "Kinetic"):
         fit.ship.boostItemAttr("shield%sDamageResonance" % damageType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/gascloudharvestingmaxgroupskilllevel.py b/eos/effects/gascloudharvestingmaxgroupskilllevel.py
index 0ffd64ee61..3491f2f440 100644
--- a/eos/effects/gascloudharvestingmaxgroupskilllevel.py
+++ b/eos/effects/gascloudharvestingmaxgroupskilllevel.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Gas Cloud Harvesting
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                     "maxGroupActive", skill.level)
\ No newline at end of file
+                                     "maxGroupActive", skill.level)
diff --git a/eos/effects/gasharvestermaxrangebonus.py b/eos/effects/gasharvestermaxrangebonus.py
index 43d88368ac..dbfd9f5648 100644
--- a/eos/effects/gasharvestermaxrangebonus.py
+++ b/eos/effects/gasharvestermaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Harvest (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
index ddae027702..015bad393f 100644
--- a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
+++ b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting"),
                                   "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/gchyieldmultiplypassive.py b/eos/effects/gchyieldmultiplypassive.py
index a86312d503..c62e662e57 100644
--- a/eos/effects/gchyieldmultiplypassive.py
+++ b/eos/effects/gchyieldmultiplypassive.py
@@ -4,6 +4,8 @@
 # Ship: Prospect
 # Ship: Venture
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
                                      "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/gunneryfalloffbonusonline.py b/eos/effects/gunneryfalloffbonusonline.py
index 4aad761b3e..553f9d428a 100644
--- a/eos/effects/gunneryfalloffbonusonline.py
+++ b/eos/effects/gunneryfalloffbonusonline.py
@@ -4,7 +4,9 @@
 # Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/gunnerymaxrangebonusonline.py b/eos/effects/gunnerymaxrangebonusonline.py
index 80742dd398..6f1bc78eda 100644
--- a/eos/effects/gunnerymaxrangebonusonline.py
+++ b/eos/effects/gunnerymaxrangebonusonline.py
@@ -4,7 +4,9 @@
 # Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py b/eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py
index 6569508c21..ef6c60e3b7 100644
--- a/eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py
+++ b/eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py
@@ -3,8 +3,10 @@
 # Used by:
 # Modules from group: Tracking Computer (11 of 11)
 type = "active"
+
+
 def handler(fit, module, context):
     for attr in ("maxRange", "falloff", "trackingSpeed"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       attr, module.getModifiedItemAttr("%sBonus" % attr),
-                                      stackingPenalties = True)
\ No newline at end of file
+                                      stackingPenalties=True)
diff --git a/eos/effects/gunnerytrackingspeedbonusonline.py b/eos/effects/gunnerytrackingspeedbonusonline.py
index d75d1de830..f7bed1ecde 100644
--- a/eos/effects/gunnerytrackingspeedbonusonline.py
+++ b/eos/effects/gunnerytrackingspeedbonusonline.py
@@ -4,7 +4,9 @@
 # Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py b/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
index 7cd2ed0656..fc4a45d26f 100644
--- a/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
@@ -5,6 +5,8 @@
 # Implant: Pashan's Turret Customization Mindlink
 # Skill: Gunnery
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/hackingskillvirusbonus.py b/eos/effects/hackingskillvirusbonus.py
index 43d9b5ebc9..35c3be1990 100644
--- a/eos/effects/hackingskillvirusbonus.py
+++ b/eos/effects/hackingskillvirusbonus.py
@@ -6,6 +6,8 @@
 # Implant: Poteque 'Prospector' Hacking HC-905
 # Skill: Hacking
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"),
diff --git a/eos/effects/hardpointmodifiereffect.py b/eos/effects/hardpointmodifiereffect.py
index 90fef97063..aeb98c46eb 100644
--- a/eos/effects/hardpointmodifiereffect.py
+++ b/eos/effects/hardpointmodifiereffect.py
@@ -4,6 +4,8 @@
 # Subsystems from group: Engineering Systems (16 of 16)
 # Subsystems from group: Offensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("turretSlotsLeft", module.getModifiedItemAttr("turretHardPointModifier"))
-    fit.ship.increaseItemAttr("launcherSlotsLeft", module.getModifiedItemAttr("launcherHardPointModifier"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("launcherSlotsLeft", module.getModifiedItemAttr("launcherHardPointModifier"))
diff --git a/eos/effects/heatdamagebonus.py b/eos/effects/heatdamagebonus.py
index 4c074f63c6..a4648cefab 100644
--- a/eos/effects/heatdamagebonus.py
+++ b/eos/effects/heatdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Shield Boost Amplifier (25 of 25)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "heatDamage", module.getModifiedItemAttr("heatDamageBonus"))
diff --git a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
index 0c294ac980..d2b5f33c28 100644
--- a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
+++ b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
@@ -4,6 +4,8 @@
 # Implants named like: Eifyr and Co. 'Rogue' High Speed Maneuvering HS (6 of 6)
 # Skill: High Speed Maneuvering
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
index 93e634b7e0..9d9ba7b728 100644
--- a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
+++ b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py
@@ -7,6 +7,8 @@
 # Implant: Mid-grade Snake Epsilon
 # Skill: Hull Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("armorHP", (container.getModifiedItemAttr("armorHpBonus") or 0) * level)
diff --git a/eos/effects/hybridweapondamagemultiply.py b/eos/effects/hybridweapondamagemultiply.py
index 092540734b..76079b9a63 100644
--- a/eos/effects/hybridweapondamagemultiply.py
+++ b/eos/effects/hybridweapondamagemultiply.py
@@ -5,7 +5,9 @@
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                      "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                      stackingPenalties = True)
\ No newline at end of file
+                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
+                                     stackingPenalties=True)
diff --git a/eos/effects/hybridweapondamagemultiplypassive.py b/eos/effects/hybridweapondamagemultiplypassive.py
index ed90ad68d3..53dcbda890 100644
--- a/eos/effects/hybridweapondamagemultiplypassive.py
+++ b/eos/effects/hybridweapondamagemultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Hybrid Collision Accelerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                      "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/hybridweaponspeedmultiply.py b/eos/effects/hybridweaponspeedmultiply.py
index fa327ff967..2ed8c8d5f0 100644
--- a/eos/effects/hybridweaponspeedmultiply.py
+++ b/eos/effects/hybridweaponspeedmultiply.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Magnetic Field Stabilizer (12 of 12)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/hybridweaponspeedmultiplypassive.py b/eos/effects/hybridweaponspeedmultiplypassive.py
index 558b0c0aa8..d40a2d630b 100644
--- a/eos/effects/hybridweaponspeedmultiplypassive.py
+++ b/eos/effects/hybridweaponspeedmultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Hybrid Burst Aerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py b/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py
index e559bc8ea4..7066cba7b1 100644
--- a/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py
+++ b/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py
@@ -5,6 +5,8 @@
 # Module: Medium Ice Harvester Accelerator I
 # Skill: Ice Harvesting
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py b/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
index b495ccaafa..19d58e81eb 100644
--- a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
+++ b/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", module.getModifiedItemAttr("iceHarvestCycleBonus"))
\ No newline at end of file
+                                  "duration", module.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/iceharvestercapacitorneedmultiplier.py b/eos/effects/iceharvestercapacitorneedmultiplier.py
index ff7e59f60b..93338c76f4 100644
--- a/eos/effects/iceharvestercapacitorneedmultiplier.py
+++ b/eos/effects/iceharvestercapacitorneedmultiplier.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
                                      "capacitorNeed", ship.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/iceharvesterdurationmultiplier.py b/eos/effects/iceharvesterdurationmultiplier.py
index 16a46a13bf..2b2cc75c84 100644
--- a/eos/effects/iceharvesterdurationmultiplier.py
+++ b/eos/effects/iceharvesterdurationmultiplier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Endurance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
                                      "duration", ship.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/iceminercpuusagepercent.py b/eos/effects/iceminercpuusagepercent.py
index 9a3f04694d..666c030a69 100644
--- a/eos/effects/iceminercpuusagepercent.py
+++ b/eos/effects/iceminercpuusagepercent.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
\ No newline at end of file
+                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/ignorecloakvelocitypenalty.py b/eos/effects/ignorecloakvelocitypenalty.py
index bcb46a480e..5fe1b1f103 100644
--- a/eos/effects/ignorecloakvelocitypenalty.py
+++ b/eos/effects/ignorecloakvelocitypenalty.py
@@ -4,6 +4,8 @@
 # Ship: Endurance
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
                                   "maxVelocityBonus", src.getModifiedItemAttr("velocityPenaltyReduction"))
diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/imperialsetbonus3.py
index d239dcc35a..bcd755f7f4 100644
--- a/eos/effects/imperialsetbonus3.py
+++ b/eos/effects/imperialsetbonus3.py
@@ -4,6 +4,9 @@
 # Implants named like: High grade Grail (6 of 6)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanRadarStrengthPercent", implant.getModifiedItemAttr("implantSetImperialNavy"))
+                                             "scanRadarStrengthPercent",
+                                             implant.getModifiedItemAttr("implantSetImperialNavy"))
diff --git a/eos/effects/imperialsetlgbonus.py b/eos/effects/imperialsetlgbonus.py
index 56369bf227..fc14ae72dd 100644
--- a/eos/effects/imperialsetlgbonus.py
+++ b/eos/effects/imperialsetlgbonus.py
@@ -4,6 +4,9 @@
 # Implants named like: Low grade Grail (6 of 6)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanRadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGImperialNavy"))
+                                             "scanRadarStrengthModifier",
+                                             implant.getModifiedItemAttr("implantSetLGImperialNavy"))
diff --git a/eos/effects/implantarmorhpbonus2.py b/eos/effects/implantarmorhpbonus2.py
index e73da41509..36c9971183 100644
--- a/eos/effects/implantarmorhpbonus2.py
+++ b/eos/effects/implantarmorhpbonus2.py
@@ -6,5 +6,7 @@
 # Implant: Imperial Navy Modified 'Noble' Implant
 # Implant: Imperial Special Ops Field Enhancer - Standard
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.boostItemAttr("armorHP", implant.getModifiedItemAttr("armorHpBonus2"))
\ No newline at end of file
+    fit.ship.boostItemAttr("armorHP", implant.getModifiedItemAttr("armorHpBonus2"))
diff --git a/eos/effects/implanthardwiringabcapacitorneed.py b/eos/effects/implanthardwiringabcapacitorneed.py
index 1a96723fe3..1f0adf21ce 100644
--- a/eos/effects/implanthardwiringabcapacitorneed.py
+++ b/eos/effects/implanthardwiringabcapacitorneed.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Fuel Conservation FC (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "capacitorNeed", implant.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/implantsetwarpspeed.py b/eos/effects/implantsetwarpspeed.py
index 29fd50e49a..ce351f428d 100644
--- a/eos/effects/implantsetwarpspeed.py
+++ b/eos/effects/implantsetwarpspeed.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Ascendancy (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed"))
+                                             "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed"))
diff --git a/eos/effects/implantvelocitybonus.py b/eos/effects/implantvelocitybonus.py
index 30665245c3..d7841ad64b 100644
--- a/eos/effects/implantvelocitybonus.py
+++ b/eos/effects/implantvelocitybonus.py
@@ -5,5 +5,7 @@
 # Implant: Genolution Core Augmentation CA-3
 # Implant: Shaqil's Speed Enhancer
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("implantBonusVelocity"))
\ No newline at end of file
+    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("implantBonusVelocity"))
diff --git a/eos/effects/implantvelocitybonus2.py b/eos/effects/implantvelocitybonus2.py
index a88fc420a9..3a39e759ff 100644
--- a/eos/effects/implantvelocitybonus2.py
+++ b/eos/effects/implantvelocitybonus2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implant: Republic Special Ops Field Enhancer - Gamma
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus2"))
\ No newline at end of file
+    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus2"))
diff --git a/eos/effects/increasesignatureradiusonline.py b/eos/effects/increasesignatureradiusonline.py
index a67dc074fe..bc58e44b93 100644
--- a/eos/effects/increasesignatureradiusonline.py
+++ b/eos/effects/increasesignatureradiusonline.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Inertial Stabilizer (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
\ No newline at end of file
+    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/industrialcoreeffect2.py b/eos/effects/industrialcoreeffect2.py
index 7bb0909f4a..0676ef92b6 100644
--- a/eos/effects/industrialcoreeffect2.py
+++ b/eos/effects/industrialcoreeffect2.py
@@ -4,6 +4,8 @@
 # Module: Industrial Core I
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
     fit.extraAttributes["siege"] = True
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
diff --git a/eos/effects/informationsquadroncommand.py b/eos/effects/informationsquadroncommand.py
index f5ff715ff6..3cb38deed4 100644
--- a/eos/effects/informationsquadroncommand.py
+++ b/eos/effects/informationsquadroncommand.py
@@ -4,6 +4,8 @@
 # Skill: Information Warfare Specialist
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/informationsquadroncommandhidden.py b/eos/effects/informationsquadroncommandhidden.py
index 0d3ca23196..97ad56e31e 100644
--- a/eos/effects/informationsquadroncommandhidden.py
+++ b/eos/effects/informationsquadroncommandhidden.py
@@ -4,6 +4,8 @@
 # Skill: Information Warfare Specialist
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
                                   "commandBonusHidden", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/informationwarfaremaxtargetrangebonus.py b/eos/effects/informationwarfaremaxtargetrangebonus.py
index 5e4bfed19a..08ee3cd690 100644
--- a/eos/effects/informationwarfaremaxtargetrangebonus.py
+++ b/eos/effects/informationwarfaremaxtargetrangebonus.py
@@ -7,5 +7,7 @@
 type = "gang"
 gangBoost = "maxTargetRange"
 gangBonus = "maxTargetRangeBonus"
+
+
 def handler(fit, container, context):
     fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/informationwarfaremindlinkhidden.py b/eos/effects/informationwarfaremindlinkhidden.py
index f59c806ba5..aac541ead8 100644
--- a/eos/effects/informationwarfaremindlinkhidden.py
+++ b/eos/effects/informationwarfaremindlinkhidden.py
@@ -5,6 +5,8 @@
 # Implant: Imperial Navy Warfare Mindlink
 # Implant: Information Warfare Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.character.getSkill("Information Warfare").suppress()
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
diff --git a/eos/effects/interceptor2hybridtracking.py b/eos/effects/interceptor2hybridtracking.py
index f1a720f415..c13c7bdea0 100644
--- a/eos/effects/interceptor2hybridtracking.py
+++ b/eos/effects/interceptor2hybridtracking.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Taranis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
\ No newline at end of file
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
+                                  skill="Interceptors")
diff --git a/eos/effects/interceptor2lasertracking.py b/eos/effects/interceptor2lasertracking.py
index b7ff9327ea..bc71ac1e21 100644
--- a/eos/effects/interceptor2lasertracking.py
+++ b/eos/effects/interceptor2lasertracking.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Crusader
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
\ No newline at end of file
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
+                                  skill="Interceptors")
diff --git a/eos/effects/interceptor2projectiledamage.py b/eos/effects/interceptor2projectiledamage.py
index a8f9761752..9d4cfeb972 100644
--- a/eos/effects/interceptor2projectiledamage.py
+++ b/eos/effects/interceptor2projectiledamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Claw
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
+                                  skill="Interceptors")
diff --git a/eos/effects/interceptor2shieldresist.py b/eos/effects/interceptor2shieldresist.py
index 9a74e396ff..301cc98c48 100644
--- a/eos/effects/interceptor2shieldresist.py
+++ b/eos/effects/interceptor2shieldresist.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Raptor
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
     for damageType in damageTypes:
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
+        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType),
+                               ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py
index 7e69a885f6..d878926d09 100644
--- a/eos/effects/interceptor2warpscramblerange.py
+++ b/eos/effects/interceptor2warpscramblerange.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Interceptor (6 of 10)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/interceptormwdsignatureradiusbonus.py
index 146fce80e7..73157a6918 100644
--- a/eos/effects/interceptormwdsignatureradiusbonus.py
+++ b/eos/effects/interceptormwdsignatureradiusbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Interceptor (10 of 10)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor"), skill="Interceptors")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor"),
+                                  skill="Interceptors")
diff --git a/eos/effects/jumpdriveskillscapacitorneedbonus.py b/eos/effects/jumpdriveskillscapacitorneedbonus.py
index 916cdbb2c9..578b0f47f6 100644
--- a/eos/effects/jumpdriveskillscapacitorneedbonus.py
+++ b/eos/effects/jumpdriveskillscapacitorneedbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Skill: Jump Drive Operation
 type = "passive"
+
+
 def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveCapacitorNeed", skill.getModifiedItemAttr("jumpDriveCapacitorNeedBonus") * skill.level)
+    fit.ship.boostItemAttr("jumpDriveCapacitorNeed",
+                           skill.getModifiedItemAttr("jumpDriveCapacitorNeedBonus") * skill.level)
diff --git a/eos/effects/jumpdriveskillsrangebonus.py b/eos/effects/jumpdriveskillsrangebonus.py
index 51f984b441..86ff1b5ce8 100644
--- a/eos/effects/jumpdriveskillsrangebonus.py
+++ b/eos/effects/jumpdriveskillsrangebonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Jump Drive Calibration
 type = "passive"
+
+
 def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveRange", skill.getModifiedItemAttr("jumpDriveRangeBonus") * skill.level)
\ No newline at end of file
+    fit.ship.boostItemAttr("jumpDriveRange", skill.getModifiedItemAttr("jumpDriveRangeBonus") * skill.level)
diff --git a/eos/effects/jumpportalconsumptionbonuspercentskill.py b/eos/effects/jumpportalconsumptionbonuspercentskill.py
index af493c170b..b823680ed4 100644
--- a/eos/effects/jumpportalconsumptionbonuspercentskill.py
+++ b/eos/effects/jumpportalconsumptionbonuspercentskill.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Jump Portal Generation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "consumptionQuantity",
                                   skill.getModifiedItemAttr("consumptionQuantityBonusPercent") * skill.level)
diff --git a/eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py
index be536b70ed..90df83fb98 100644
--- a/eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py
+++ b/eos/effects/kineticarmorcompensationhardeningbonusgrouparmorcoating.py
@@ -3,7 +3,9 @@
 # Used by:
 # Skill: Kinetic Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
                                   "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py
index e60cdc9927..6300b21af3 100644
--- a/eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py
+++ b/eos/effects/kineticarmorcompensationhardeningbonusgroupenergized.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Kinetic Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "kineticDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "kineticDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py
index d230979b74..3b07f59573 100644
--- a/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py
+++ b/eos/effects/kineticshieldcompensationhardeningbonusgroupshieldamp.py
@@ -3,7 +3,9 @@
 # Used by:
 # Skill: Kinetic Shield Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
                                   "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py b/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py
index 93b47aacdf..09ffdc5fb6 100644
--- a/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py
+++ b/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py
@@ -5,6 +5,8 @@
 # Implant: Pashan's Turret Handling Mindlink
 # Skill: Large Energy Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
diff --git a/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py b/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py
index bb3fdf0978..ea808b755b 100644
--- a/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py
+++ b/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
 # Skill: Large Hybrid Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
diff --git a/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py b/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py
index 25a394c773..e7f214d196 100644
--- a/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py
+++ b/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
 # Skill: Large Projectile Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
diff --git a/eos/effects/leadershipeffect.py b/eos/effects/leadershipeffect.py
index f7aaa4d12e..cfb6727272 100644
--- a/eos/effects/leadershipeffect.py
+++ b/eos/effects/leadershipeffect.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "scanResolution"
 gangBonus = "scanResolutionBonus"
+
+
 def handler(fit, skill, context):
-    fit.ship.boostItemAttr(gangBoost, skill.getModifiedItemAttr(gangBonus) * skill.level, stackingPenalties = True)
+    fit.ship.boostItemAttr(gangBoost, skill.getModifiedItemAttr(gangBonus) * skill.level, stackingPenalties=True)
diff --git a/eos/effects/lightningweapon.py b/eos/effects/lightningweapon.py
index 45ca33f3fc..4f2324035b 100644
--- a/eos/effects/lightningweapon.py
+++ b/eos/effects/lightningweapon.py
@@ -1,4 +1,6 @@
 # Not used by any item
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py b/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py
index 1c94296372..ac11238db8 100644
--- a/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py
+++ b/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gypsy' Long Range Targeting LT (6 of 6)
 # Skill: Long Range Targeting
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("maxTargetRange", container.getModifiedItemAttr("maxTargetRangeBonus") * level)
diff --git a/eos/effects/maraudermodeeffect26.py b/eos/effects/maraudermodeeffect26.py
index 74b730de6e..f892a5a528 100644
--- a/eos/effects/maraudermodeeffect26.py
+++ b/eos/effects/maraudermodeeffect26.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
     # Resistances
     for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
@@ -13,30 +15,32 @@ def handler(fit, module, context):
                                       stackingPenalties=penalize, penaltyGroup="preMul")
 
     # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \
-                                  mod.item.requiresSkill("Large Hybrid Turret") or \
-                                  mod.item.requiresSkill("Large Projectile Turret"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
+                                              mod.item.requiresSkill("Large Hybrid Turret") or
+                                              mod.item.requiresSkill("Large Projectile Turret"),
                                   "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
                                   stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \
-                                  mod.item.requiresSkill("Large Hybrid Turret") or \
-                                  mod.item.requiresSkill("Large Projectile Turret"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
+                                              mod.item.requiresSkill("Large Hybrid Turret") or
+                                              mod.item.requiresSkill("Large Projectile Turret"),
                                   "falloff", module.getModifiedItemAttr("falloffBonus"),
                                   stackingPenalties=True)
 
     # Missiles
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \
-                                    mod.charge.requiresSkill("Cruise Missiles") or \
-                                    mod.charge.requiresSkill("Heavy Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or
+                                                mod.charge.requiresSkill("Cruise Missiles") or
+                                                mod.charge.requiresSkill("Heavy Missiles"),
                                     "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"))
 
     # Tanking
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems") or mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountBonus"),
-                                  stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-                                  stackingPenalties=True)
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Capital Repair Systems") or mod.item.requiresSkill("Repair Systems"),
+        "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountBonus"),
+        stackingPenalties=True)
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Capital Shield Operation") or mod.item.requiresSkill("Shield Operation"),
+        "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
+        stackingPenalties=True)
 
     # Speed penalty
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
diff --git a/eos/effects/massaddpassive.py b/eos/effects/massaddpassive.py
index 4bb107c72b..929d32c5da 100644
--- a/eos/effects/massaddpassive.py
+++ b/eos/effects/massaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Items from category: Subsystem (80 of 80)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("mass") or 0)
diff --git a/eos/effects/massreductionbonuspassive.py b/eos/effects/massreductionbonuspassive.py
index 13e72f7264..abc1dddde4 100644
--- a/eos/effects/massreductionbonuspassive.py
+++ b/eos/effects/massreductionbonuspassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Rig Anchor (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/maxrangebonuseffecthybrids.py b/eos/effects/maxrangebonuseffecthybrids.py
index b931faf284..68f035cc67 100644
--- a/eos/effects/maxrangebonuseffecthybrids.py
+++ b/eos/effects/maxrangebonuseffecthybrids.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Hybrid Locus Coordinator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                   "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/maxrangebonuseffectlasers.py b/eos/effects/maxrangebonuseffectlasers.py
index 8df9ca347d..7f4126ad8c 100644
--- a/eos/effects/maxrangebonuseffectlasers.py
+++ b/eos/effects/maxrangebonuseffectlasers.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Energy Locus Coordinator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
                                   "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/maxrangebonuseffectprojectiles.py b/eos/effects/maxrangebonuseffectprojectiles.py
index 8e56c8a1c0..5f433584cb 100644
--- a/eos/effects/maxrangebonuseffectprojectiles.py
+++ b/eos/effects/maxrangebonuseffectprojectiles.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Projectile Locus Coordinator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
                                   "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                  stackingPenalties=True)
diff --git a/eos/effects/maxtargetingrangebonuspostpercentpassive.py b/eos/effects/maxtargetingrangebonuspostpercentpassive.py
index e000410f51..6a0c0e916f 100644
--- a/eos/effects/maxtargetingrangebonuspostpercentpassive.py
+++ b/eos/effects/maxtargetingrangebonuspostpercentpassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Ionic Field Projector (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                              stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/maxtargetrangeaddpassive.py b/eos/effects/maxtargetrangeaddpassive.py
index a2f352ab66..8afd7b53e9 100644
--- a/eos/effects/maxtargetrangeaddpassive.py
+++ b/eos/effects/maxtargetrangeaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Electronic Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRange"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRange"))
diff --git a/eos/effects/maxtargetrangebonus.py b/eos/effects/maxtargetrangebonus.py
index a7e0adc460..96731483bd 100644
--- a/eos/effects/maxtargetrangebonus.py
+++ b/eos/effects/maxtargetrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
\ No newline at end of file
+                           stackingPenalties=True)
diff --git a/eos/effects/maxvelocityaddpassive.py b/eos/effects/maxvelocityaddpassive.py
index 7c97bf7cde..c529918f4f 100644
--- a/eos/effects/maxvelocityaddpassive.py
+++ b/eos/effects/maxvelocityaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Propulsion Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocity"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocity"))
diff --git a/eos/effects/mechanichullhpbonuspostpercenthpship.py b/eos/effects/mechanichullhpbonuspostpercenthpship.py
index 76da1c0c75..3f01c5422a 100644
--- a/eos/effects/mechanichullhpbonuspostpercenthpship.py
+++ b/eos/effects/mechanichullhpbonuspostpercenthpship.py
@@ -5,6 +5,8 @@
 # Modules named like: Transverse Bulkhead (8 of 8)
 # Skill: Mechanics
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("hp", container.getModifiedItemAttr("hullHpBonus") * level)
diff --git a/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py b/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py
index 00bcb480d6..c70854c90f 100644
--- a/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py
+++ b/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
 # Skill: Medium Energy Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
diff --git a/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py b/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py
index b621eb5452..e64a0d35bf 100644
--- a/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py
+++ b/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
 # Skill: Medium Hybrid Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
diff --git a/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py b/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py
index d3a7f4fd6f..8bd3dec228 100644
--- a/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py
+++ b/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
 # Skill: Medium Projectile Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
diff --git a/eos/effects/mercoxitcrystalbonus.py b/eos/effects/mercoxitcrystalbonus.py
index 52fb3b2c8f..97a255397b 100644
--- a/eos/effects/mercoxitcrystalbonus.py
+++ b/eos/effects/mercoxitcrystalbonus.py
@@ -3,7 +3,10 @@
 # Used by:
 # Module: Medium Mercoxit Mining Crystal Optimization I
 type = "passive"
-runTime="early"
+runTime = "early"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mercoxit Processing"),
-                                    "specialisationAsteroidYieldMultiplier", module.getModifiedItemAttr("miningAmountBonus"))
+                                    "specialisationAsteroidYieldMultiplier",
+                                    module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/microjumpdrive.py b/eos/effects/microjumpdrive.py
index 3d117a6a49..c8797d7d01 100644
--- a/eos/effects/microjumpdrive.py
+++ b/eos/effects/microjumpdrive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Micro Jump Drive (2 of 2)
 type = "active"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"))
\ No newline at end of file
+    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"))
diff --git a/eos/effects/minercpuusagemultiplypercent2.py b/eos/effects/minercpuusagemultiplypercent2.py
index f76b5323bd..7b8e6025a9 100644
--- a/eos/effects/minercpuusagemultiplypercent2.py
+++ b/eos/effects/minercpuusagemultiplypercent2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
\ No newline at end of file
+                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py
index f2e9de20d3..774367539e 100644
--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -11,7 +11,10 @@
 # Ship: Nestor
 # Ship: Probe
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
-                                     "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)
+    fit.modules.filteredItemIncrease(
+        lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
+        "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)
diff --git a/eos/effects/mining.py b/eos/effects/mining.py
index 23a5bf7e78..6a80437e9a 100644
--- a/eos/effects/mining.py
+++ b/eos/effects/mining.py
@@ -6,9 +6,10 @@
 type = "passive"
 grouped = True
 
+
 def handler(fit, container, context):
     miningDroneAmountPercent = container.getModifiedItemAttr("miningDroneAmountPercent")
     if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
         pass
     else:
-        container.multiplyItemAttr("miningAmount", miningDroneAmountPercent/100)
+        container.multiplyItemAttr("miningAmount", miningDroneAmountPercent / 100)
diff --git a/eos/effects/miningclouds.py b/eos/effects/miningclouds.py
index 543851c782..f378962339 100644
--- a/eos/effects/miningclouds.py
+++ b/eos/effects/miningclouds.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Gas Cloud Harvester (5 of 5)
 type = "active"
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/miningdirectorbonuscommandbonuseffective.py b/eos/effects/miningdirectorbonuscommandbonuseffective.py
index 825d66b798..8ab6331155 100644
--- a/eos/effects/miningdirectorbonuscommandbonuseffective.py
+++ b/eos/effects/miningdirectorbonuscommandbonuseffective.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
                                   "commandBonus", ship.getModifiedItemAttr("commandBonusEffective"))
diff --git a/eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py b/eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py
index ebad7da0e5..2a3e702112 100644
--- a/eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py
+++ b/eos/effects/miningdroneoperationminingamountbonuspostpercentminingdroneamountpercentchar.py
@@ -4,6 +4,8 @@
 # Modules named like: Drone Mining Augmentor (8 of 8)
 # Skill: Mining Drone Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone",
diff --git a/eos/effects/miningforemanmindlink.py b/eos/effects/miningforemanmindlink.py
index 8ae84ef7d4..2a595dd97b 100644
--- a/eos/effects/miningforemanmindlink.py
+++ b/eos/effects/miningforemanmindlink.py
@@ -3,7 +3,9 @@
 # Used by:
 # Implant: Mining Foreman Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.character.getSkill("Mining Foreman").suppress()
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
-                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
\ No newline at end of file
+                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py b/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py
index ddf2a573fb..1e4921fbbc 100644
--- a/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py
+++ b/eos/effects/miningforemanmindlinkminingamountbonusreplacer.py
@@ -5,6 +5,8 @@
 type = "gang"
 gangBoost = "miningAmount"
 gangBonus = "miningAmountBonus"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
                                   gangBoost, container.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
index e16c8ef865..094e017136 100644
--- a/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
+++ b/eos/effects/miningfrigatebonusiceharvestingcycletime2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Endurance
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
+                                  src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/mininginfomultiplier.py b/eos/effects/mininginfomultiplier.py
index ca6a4eaed8..d0ca121806 100644
--- a/eos/effects/mininginfomultiplier.py
+++ b/eos/effects/mininginfomultiplier.py
@@ -4,6 +4,8 @@
 # Charges from group: Mining Crystal (30 of 30)
 # Charges named like: Mining Crystal (32 of 32)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.multiplyItemAttr("specialtyMiningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
     #module.multiplyItemAttr("miningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
diff --git a/eos/effects/mininglaser.py b/eos/effects/mininglaser.py
index 6189b79830..09bda59bfc 100644
--- a/eos/effects/mininglaser.py
+++ b/eos/effects/mininglaser.py
@@ -5,6 +5,8 @@
 # Modules from group: Mining Laser (15 of 15)
 # Modules from group: Strip Miner (5 of 5)
 type = 'active'
+
+
 def handler(fit, module, context):
     # Set reload time to 1 second
     module.reloadTime = 1000
diff --git a/eos/effects/mininglaserrangebonus.py b/eos/effects/mininglaserrangebonus.py
index dbfe9d4863..163574ba9c 100644
--- a/eos/effects/mininglaserrangebonus.py
+++ b/eos/effects/mininglaserrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Harvest (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
\ No newline at end of file
+                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/miningsquadroncommand.py b/eos/effects/miningsquadroncommand.py
index 74520654f3..77a9c0b20e 100644
--- a/eos/effects/miningsquadroncommand.py
+++ b/eos/effects/miningsquadroncommand.py
@@ -4,6 +4,8 @@
 # Skill: Mining Director
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py b/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py
index 867a3913c5..f5afa70b66 100644
--- a/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py
+++ b/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py
@@ -4,7 +4,10 @@
 # Implants named like: Inherent Implants 'Highwall' Mining Upgrades MU (3 of 3)
 # Skill: Mining Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Upgrades"),
-                                  "cpuPenaltyPercent", container.getModifiedItemAttr("miningUpgradeCPUReductionBonus") * level)
+                                  "cpuPenaltyPercent",
+                                  container.getModifiedItemAttr("miningUpgradeCPUReductionBonus") * level)
diff --git a/eos/effects/miningyieldgangbonusfixed.py b/eos/effects/miningyieldgangbonusfixed.py
index 1b6a0a5830..e597db001f 100644
--- a/eos/effects/miningyieldgangbonusfixed.py
+++ b/eos/effects/miningyieldgangbonusfixed.py
@@ -5,6 +5,8 @@
 type = "gang"
 gangBoost = "miningAmount"
 gangBonus = "miningAmountBonus"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
diff --git a/eos/effects/miningyieldmultiplypassive.py b/eos/effects/miningyieldmultiplypassive.py
index a7c86d49ea..13b45eb390 100644
--- a/eos/effects/miningyieldmultiplypassive.py
+++ b/eos/effects/miningyieldmultiplypassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Venture (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),
-                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
\ No newline at end of file
+                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/miningyieldmultiplypercent.py b/eos/effects/miningyieldmultiplypercent.py
index d00198ab42..281b7169fc 100644
--- a/eos/effects/miningyieldmultiplypercent.py
+++ b/eos/effects/miningyieldmultiplypercent.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("miningAmountBonus"))
\ No newline at end of file
+                                  "miningAmount", module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/minmatarshipewtargetpaintermc1.py b/eos/effects/minmatarshipewtargetpaintermc1.py
index 77cdb088b5..e1f9fcb2d0 100644
--- a/eos/effects/minmatarshipewtargetpaintermc1.py
+++ b/eos/effects/minmatarshipewtargetpaintermc1.py
@@ -4,6 +4,9 @@
 # Ship: Bellicose
 # Ship: Rapier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC"),
+                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/minmatarshipewtargetpaintermc2.py b/eos/effects/minmatarshipewtargetpaintermc2.py
index 899ef2036e..cb80fba620 100644
--- a/eos/effects/minmatarshipewtargetpaintermc2.py
+++ b/eos/effects/minmatarshipewtargetpaintermc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Huginn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2"),
+                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/minmatarshipewtargetpaintermf2.py b/eos/effects/minmatarshipewtargetpaintermf2.py
index 556db7d5bf..0140a5d578 100644
--- a/eos/effects/minmatarshipewtargetpaintermf2.py
+++ b/eos/effects/minmatarshipewtargetpaintermf2.py
@@ -4,6 +4,9 @@
 # Ship: Hyena
 # Ship: Vigil
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2"),
+                                  skill="Minmatar Frigate")
diff --git a/eos/effects/minmatarshipewtargetpainterrookie.py b/eos/effects/minmatarshipewtargetpainterrookie.py
index bab5d37d1e..92b3330dc0 100644
--- a/eos/effects/minmatarshipewtargetpainterrookie.py
+++ b/eos/effects/minmatarshipewtargetpainterrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Reaper
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
                                   "signatureRadiusBonus", ship.getModifiedItemAttr("rookieTargetPainterStrengthBonus"))
diff --git a/eos/effects/missileaoecloudsizebonusonline.py b/eos/effects/missileaoecloudsizebonusonline.py
index 11ebe04f24..bbc42b61b5 100644
--- a/eos/effects/missileaoecloudsizebonusonline.py
+++ b/eos/effects/missileaoecloudsizebonusonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Missile Guidance Enhancer (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "aoeCloudSize", module.getModifiedItemAttr("aoeCloudSizeBonus"),
diff --git a/eos/effects/missileaoevelocitybonusonline.py b/eos/effects/missileaoevelocitybonusonline.py
index acfa8c8ec4..e5d0d27c98 100644
--- a/eos/effects/missileaoevelocitybonusonline.py
+++ b/eos/effects/missileaoevelocitybonusonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Missile Guidance Enhancer (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "aoeVelocity", module.getModifiedItemAttr("aoeVelocityBonus"),
diff --git a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py
index 30db4b96b4..e7356d260f 100644
--- a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py
+++ b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py
@@ -6,6 +6,8 @@
 # Implant: Antipharmakon Toxot
 # Skill: Missile Bombardment
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalized = False if "skill" in context or "implant" in context or "booster" in context else True
diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py
index f2604350bc..d18ce2e303 100644
--- a/eos/effects/missiledmgbonus.py
+++ b/eos/effects/missiledmgbonus.py
@@ -4,8 +4,11 @@
 # Modules from group: Ballistic Control system (17 of 17)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
+
+
 def handler(fit, container, context):
     for dmgType in ("em", "kinetic", "explosive", "thermal"):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "%sDamage" % dmgType, container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                    stackingPenalties = True)
\ No newline at end of file
+                                           "%sDamage" % dmgType,
+                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
+                                           stackingPenalties=True)
diff --git a/eos/effects/missiledmgbonuspassive.py b/eos/effects/missiledmgbonuspassive.py
index 1e32351e53..4934dc7cff 100644
--- a/eos/effects/missiledmgbonuspassive.py
+++ b/eos/effects/missiledmgbonuspassive.py
@@ -3,8 +3,11 @@
 # Used by:
 # Modules named like: Warhead Calefaction Catalyst (8 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     for dmgType in ("em", "kinetic", "explosive", "thermal"):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                           "%sDamage" % dmgType, container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties = True)
\ No newline at end of file
+                                           "%sDamage" % dmgType,
+                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
+                                           stackingPenalties=True)
diff --git a/eos/effects/missileemdmgbonus.py b/eos/effects/missileemdmgbonus.py
index 27d7b7f705..4b745afd20 100644
--- a/eos/effects/missileemdmgbonus.py
+++ b/eos/effects/missileemdmgbonus.py
@@ -5,6 +5,8 @@
 # Skill: Rockets
 # Skill: Torpedoes
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
                                     "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missileemdmgbonuscruise3.py b/eos/effects/missileemdmgbonuscruise3.py
index f75509d074..c7f718062a 100644
--- a/eos/effects/missileemdmgbonuscruise3.py
+++ b/eos/effects/missileemdmgbonuscruise3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileemdmgbonusham.py b/eos/effects/missileemdmgbonusham.py
index 369f792b56..93b008b9a0 100644
--- a/eos/effects/missileemdmgbonusham.py
+++ b/eos/effects/missileemdmgbonusham.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileemdmgbonusheavy.py b/eos/effects/missileemdmgbonusheavy.py
index 32807bda71..35a8f634b0 100644
--- a/eos/effects/missileemdmgbonusheavy.py
+++ b/eos/effects/missileemdmgbonusheavy.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileemdmgbonusrocket.py b/eos/effects/missileemdmgbonusrocket.py
index 8c17c10c03..cf4d1e8267 100644
--- a/eos/effects/missileemdmgbonusrocket.py
+++ b/eos/effects/missileemdmgbonusrocket.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileemdmgbonusstandard.py b/eos/effects/missileemdmgbonusstandard.py
index 357be1063b..82b69159a3 100644
--- a/eos/effects/missileemdmgbonusstandard.py
+++ b/eos/effects/missileemdmgbonusstandard.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileemdmgbonustorpedo.py b/eos/effects/missileemdmgbonustorpedo.py
index f0910b5f44..82b228f3e6 100644
--- a/eos/effects/missileemdmgbonustorpedo.py
+++ b/eos/effects/missileemdmgbonustorpedo.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosiondelaybonusonline.py b/eos/effects/missileexplosiondelaybonusonline.py
index 3f69492178..a23f9a2fe0 100644
--- a/eos/effects/missileexplosiondelaybonusonline.py
+++ b/eos/effects/missileexplosiondelaybonusonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Missile Guidance Enhancer (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "explosionDelay", module.getModifiedItemAttr("explosionDelayBonus"),
diff --git a/eos/effects/missileexplosivedmgbonus.py b/eos/effects/missileexplosivedmgbonus.py
index 7d8c4f1820..6f12347b3a 100644
--- a/eos/effects/missileexplosivedmgbonus.py
+++ b/eos/effects/missileexplosivedmgbonus.py
@@ -5,6 +5,8 @@
 # Skill: Rockets
 # Skill: Torpedoes
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
                                     "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missileexplosivedmgbonuscruise3.py b/eos/effects/missileexplosivedmgbonuscruise3.py
index d9ec32d1f2..8617995101 100644
--- a/eos/effects/missileexplosivedmgbonuscruise3.py
+++ b/eos/effects/missileexplosivedmgbonuscruise3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage",container.getModifiedItemAttr("damageMultiplierBonus"))
+                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosivedmgbonusham.py b/eos/effects/missileexplosivedmgbonusham.py
index 4943595cd7..8000c3df0e 100644
--- a/eos/effects/missileexplosivedmgbonusham.py
+++ b/eos/effects/missileexplosivedmgbonusham.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosivedmgbonusheavy.py b/eos/effects/missileexplosivedmgbonusheavy.py
index bda894ff93..dc68d5aed0 100644
--- a/eos/effects/missileexplosivedmgbonusheavy.py
+++ b/eos/effects/missileexplosivedmgbonusheavy.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosivedmgbonusrocket.py b/eos/effects/missileexplosivedmgbonusrocket.py
index c6da4037d7..437d99761d 100644
--- a/eos/effects/missileexplosivedmgbonusrocket.py
+++ b/eos/effects/missileexplosivedmgbonusrocket.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosivedmgbonusstandard.py b/eos/effects/missileexplosivedmgbonusstandard.py
index b62945dc86..67c75f102d 100644
--- a/eos/effects/missileexplosivedmgbonusstandard.py
+++ b/eos/effects/missileexplosivedmgbonusstandard.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileexplosivedmgbonustorpedo.py b/eos/effects/missileexplosivedmgbonustorpedo.py
index 6f324f593a..9611c2b222 100644
--- a/eos/effects/missileexplosivedmgbonustorpedo.py
+++ b/eos/effects/missileexplosivedmgbonustorpedo.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missileguidancecomputerbonus4.py b/eos/effects/missileguidancecomputerbonus4.py
index d1295c6575..a276fe2db4 100644
--- a/eos/effects/missileguidancecomputerbonus4.py
+++ b/eos/effects/missileguidancecomputerbonus4.py
@@ -3,12 +3,14 @@
 # Used by:
 # Modules from group: Missile Guidance Computer (3 of 3)
 type = "active"
+
+
 def handler(fit, container, context):
     for srcAttr, tgtAttr in (
-        ("aoeCloudSizeBonus", "aoeCloudSize"),
-        ("aoeVelocityBonus", "aoeVelocity"),
-        ("missileVelocityBonus", "maxVelocity"),
-        ("explosionDelayBonus", "explosionDelay"),
+            ("aoeCloudSizeBonus", "aoeCloudSize"),
+            ("aoeVelocityBonus", "aoeVelocity"),
+            ("missileVelocityBonus", "maxVelocity"),
+            ("explosionDelayBonus", "explosionDelay"),
     ):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                         tgtAttr, container.getModifiedItemAttr(srcAttr),
diff --git a/eos/effects/missilekineticdmgbonus2.py b/eos/effects/missilekineticdmgbonus2.py
index 5c476ec65b..4de2675550 100644
--- a/eos/effects/missilekineticdmgbonus2.py
+++ b/eos/effects/missilekineticdmgbonus2.py
@@ -5,6 +5,8 @@
 # Skill: Rockets
 # Skill: Torpedoes
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
                                     "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missilekineticdmgbonuscruise3.py b/eos/effects/missilekineticdmgbonuscruise3.py
index e0cf8573f0..7ce36c44be 100644
--- a/eos/effects/missilekineticdmgbonuscruise3.py
+++ b/eos/effects/missilekineticdmgbonuscruise3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilekineticdmgbonusham.py b/eos/effects/missilekineticdmgbonusham.py
index a03ea8355e..4a01de0bba 100644
--- a/eos/effects/missilekineticdmgbonusham.py
+++ b/eos/effects/missilekineticdmgbonusham.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilekineticdmgbonusheavy.py b/eos/effects/missilekineticdmgbonusheavy.py
index 577899c5ea..56296feb14 100644
--- a/eos/effects/missilekineticdmgbonusheavy.py
+++ b/eos/effects/missilekineticdmgbonusheavy.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilekineticdmgbonusrocket.py b/eos/effects/missilekineticdmgbonusrocket.py
index 70a07aeafa..ab04fedf1a 100644
--- a/eos/effects/missilekineticdmgbonusrocket.py
+++ b/eos/effects/missilekineticdmgbonusrocket.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilekineticdmgbonusstandard.py b/eos/effects/missilekineticdmgbonusstandard.py
index 2ec07fca8f..e8f3714fa6 100644
--- a/eos/effects/missilekineticdmgbonusstandard.py
+++ b/eos/effects/missilekineticdmgbonusstandard.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilekineticdmgbonustorpedo.py b/eos/effects/missilekineticdmgbonustorpedo.py
index b2cd9e427a..de8d92fb62 100644
--- a/eos/effects/missilekineticdmgbonustorpedo.py
+++ b/eos/effects/missilekineticdmgbonustorpedo.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/missilelauncherspeedmultiplier.py
index 021bd72401..e9a3c12716 100644
--- a/eos/effects/missilelauncherspeedmultiplier.py
+++ b/eos/effects/missilelauncherspeedmultiplier.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Ballistic Control system (17 of 17)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties=True)
diff --git a/eos/effects/missilelauncherspeedmultiplierpassive.py b/eos/effects/missilelauncherspeedmultiplierpassive.py
index 82d09ab03c..6c3c147bb2 100644
--- a/eos/effects/missilelauncherspeedmultiplierpassive.py
+++ b/eos/effects/missilelauncherspeedmultiplierpassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Bay Loading Accelerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties=True)
diff --git a/eos/effects/missileskillaoecloudsizebonus.py b/eos/effects/missileskillaoecloudsizebonus.py
index 6d97e56cdf..0e3bfdddf0 100644
--- a/eos/effects/missileskillaoecloudsizebonus.py
+++ b/eos/effects/missileskillaoecloudsizebonus.py
@@ -5,6 +5,8 @@
 # Modules named like: Warhead Rigor Catalyst (8 of 8)
 # Skill: Guided Missile Precision
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalize = False if "skill" in context or "implant" in context else True
diff --git a/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py b/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py
index 53a84ac3f4..9593201fc8 100644
--- a/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py
+++ b/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Crash Booster (4 of 4)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus"))
diff --git a/eos/effects/missileskillaoevelocitybonus.py b/eos/effects/missileskillaoevelocitybonus.py
index a059eee930..28fdae1118 100644
--- a/eos/effects/missileskillaoevelocitybonus.py
+++ b/eos/effects/missileskillaoevelocitybonus.py
@@ -5,6 +5,8 @@
 # Modules named like: Warhead Flare Catalyst (8 of 8)
 # Skill: Target Navigation Prediction
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalize = False if "skill" in context or "implant" in context else True
diff --git a/eos/effects/missileskillfofaoecloudsizebonus.py b/eos/effects/missileskillfofaoecloudsizebonus.py
index 8dabd071cf..cd3b2977c2 100644
--- a/eos/effects/missileskillfofaoecloudsizebonus.py
+++ b/eos/effects/missileskillfofaoecloudsizebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' FOF Explosion Radius FR (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("FoF Missiles"),
diff --git a/eos/effects/missileskillmissileprojectilevelocitybonus.py b/eos/effects/missileskillmissileprojectilevelocitybonus.py
index 2168de284c..3c7cee7750 100644
--- a/eos/effects/missileskillmissileprojectilevelocitybonus.py
+++ b/eos/effects/missileskillmissileprojectilevelocitybonus.py
@@ -5,6 +5,8 @@
 # Modules named like: Hydraulic Bay Thrusters (8 of 8)
 # Skill: Missile Projection
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalized = False if "skill" in context or "implant" in context else True
diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/missileskillrapidlauncherrof.py
index 7cba9d32a1..9cdc9a0f66 100644
--- a/eos/effects/missileskillrapidlauncherrof.py
+++ b/eos/effects/missileskillrapidlauncherrof.py
@@ -7,7 +7,9 @@
 # Skill: Missile Launcher Operation
 # Skill: Rapid Launch
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "speed", container.getModifiedItemAttr("rofBonus") * level)
+                                  "speed", container.getModifiedItemAttr("rofBonus") * level)
diff --git a/eos/effects/missileskillwarheadupgradesemdamagebonus.py b/eos/effects/missileskillwarheadupgradesemdamagebonus.py
index 239ab1a208..352318e43f 100644
--- a/eos/effects/missileskillwarheadupgradesemdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesemdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warhead Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py b/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
index f738418b5d..a466b5501e 100644
--- a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warhead Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py b/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
index d907f84527..6d30090f7f 100644
--- a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warhead Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py b/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
index dca7a5333a..073831baca 100644
--- a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warhead Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missilethermaldmgbonus.py b/eos/effects/missilethermaldmgbonus.py
index fba2a89791..162e5beb6b 100644
--- a/eos/effects/missilethermaldmgbonus.py
+++ b/eos/effects/missilethermaldmgbonus.py
@@ -5,6 +5,8 @@
 # Skill: Rockets
 # Skill: Torpedoes
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
                                     "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/missilethermaldmgbonuscruise3.py b/eos/effects/missilethermaldmgbonuscruise3.py
index dd54307e3c..47bd9feeba 100644
--- a/eos/effects/missilethermaldmgbonuscruise3.py
+++ b/eos/effects/missilethermaldmgbonuscruise3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilethermaldmgbonusham.py b/eos/effects/missilethermaldmgbonusham.py
index 9e22251678..13e2d3398b 100644
--- a/eos/effects/missilethermaldmgbonusham.py
+++ b/eos/effects/missilethermaldmgbonusham.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilethermaldmgbonusheavy.py b/eos/effects/missilethermaldmgbonusheavy.py
index 6235a950e7..5e4087e844 100644
--- a/eos/effects/missilethermaldmgbonusheavy.py
+++ b/eos/effects/missilethermaldmgbonusheavy.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilethermaldmgbonusrocket.py b/eos/effects/missilethermaldmgbonusrocket.py
index 638db2d0ec..20694a704d 100644
--- a/eos/effects/missilethermaldmgbonusrocket.py
+++ b/eos/effects/missilethermaldmgbonusrocket.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilethermaldmgbonusstandard.py b/eos/effects/missilethermaldmgbonusstandard.py
index 0249a47920..49a8006e7a 100644
--- a/eos/effects/missilethermaldmgbonusstandard.py
+++ b/eos/effects/missilethermaldmgbonusstandard.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilethermaldmgbonustorpedo.py b/eos/effects/missilethermaldmgbonustorpedo.py
index 77b9c2e004..22293eb068 100644
--- a/eos/effects/missilethermaldmgbonustorpedo.py
+++ b/eos/effects/missilethermaldmgbonustorpedo.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/missilevelocitybonusdefender.py b/eos/effects/missilevelocitybonusdefender.py
index 3ef92fa813..350eabe4db 100644
--- a/eos/effects/missilevelocitybonusdefender.py
+++ b/eos/effects/missilevelocitybonusdefender.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: Zainou 'Snapshot' Defender Missiles DM (6 of 6)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
                                        "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"))
diff --git a/eos/effects/missilevelocitybonusonline.py b/eos/effects/missilevelocitybonusonline.py
index 947a2dfac6..f04d472925 100644
--- a/eos/effects/missilevelocitybonusonline.py
+++ b/eos/effects/missilevelocitybonusonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Missile Guidance Enhancer (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"),
diff --git a/eos/effects/modeagilitypostdiv.py b/eos/effects/modeagilitypostdiv.py
index 591290d5c8..485100a7a1 100644
--- a/eos/effects/modeagilitypostdiv.py
+++ b/eos/effects/modeagilitypostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Propulsion Mode (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(
         "agility",
diff --git a/eos/effects/modearmorrepdurationpostdiv.py b/eos/effects/modearmorrepdurationpostdiv.py
index ecfc76c1f6..58f61b557d 100644
--- a/eos/effects/modearmorrepdurationpostdiv.py
+++ b/eos/effects/modearmorrepdurationpostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Hecate Defense Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("Repair Systems"),
diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/modearmorresonancepostdiv.py
index 708fafc9ee..f6a744c4db 100644
--- a/eos/effects/modearmorresonancepostdiv.py
+++ b/eos/effects/modearmorresonancepostdiv.py
@@ -3,12 +3,14 @@
 # Used by:
 # Modules named like: Defense Mode (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     for srcResType, tgtResType in (
-        ("Em", "Em"),
-        ("Explosive", "Explosive"),
-        ("Kinetic", "Kinetic"),
-        ("Thermic", "Thermal")
+            ("Em", "Em"),
+            ("Explosive", "Explosive"),
+            ("Kinetic", "Kinetic"),
+            ("Thermic", "Thermal")
     ):
         fit.ship.multiplyItemAttr(
             "armor{0}DamageResonance".format(tgtResType),
diff --git a/eos/effects/modehullresonancepostdiv.py b/eos/effects/modehullresonancepostdiv.py
index bc38b1e18c..ae13c4b7d2 100644
--- a/eos/effects/modehullresonancepostdiv.py
+++ b/eos/effects/modehullresonancepostdiv.py
@@ -3,12 +3,14 @@
 # Used by:
 # Module: Hecate Defense Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     for srcResType, tgtResType in (
-        ("Em", "em"),
-        ("Explosive", "explosive"),
-        ("Kinetic", "kinetic"),
-        ("Thermic", "thermal")
+            ("Em", "em"),
+            ("Explosive", "explosive"),
+            ("Kinetic", "kinetic"),
+            ("Thermic", "thermal")
     ):
         fit.ship.multiplyItemAttr(
             "{0}DamageResonance".format(tgtResType),
diff --git a/eos/effects/modemwdboostpostdiv.py b/eos/effects/modemwdboostpostdiv.py
index 5669e906b0..ad9ddf55e5 100644
--- a/eos/effects/modemwdboostpostdiv.py
+++ b/eos/effects/modemwdboostpostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Hecate Propulsion Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/modemwdcappostdiv.py b/eos/effects/modemwdcappostdiv.py
index 7ad0ba1514..6d16ea720e 100644
--- a/eos/effects/modemwdcappostdiv.py
+++ b/eos/effects/modemwdcappostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Hecate Propulsion Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/modemwdsigradiuspostdiv.py b/eos/effects/modemwdsigradiuspostdiv.py
index 01421c82e2..f1aeca8eba 100644
--- a/eos/effects/modemwdsigradiuspostdiv.py
+++ b/eos/effects/modemwdsigradiuspostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Svipul Defense Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
diff --git a/eos/effects/modeshieldresonancepostdiv.py b/eos/effects/modeshieldresonancepostdiv.py
index de5de9343b..7213168b0a 100644
--- a/eos/effects/modeshieldresonancepostdiv.py
+++ b/eos/effects/modeshieldresonancepostdiv.py
@@ -4,12 +4,14 @@
 # Module: Jackdaw Defense Mode
 # Module: Svipul Defense Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     for srcResType, tgtResType in (
-        ("Em", "Em"),
-        ("Explosive", "Explosive"),
-        ("Kinetic", "Kinetic"),
-        ("Thermic", "Thermal")
+            ("Em", "Em"),
+            ("Explosive", "Explosive"),
+            ("Kinetic", "Kinetic"),
+            ("Thermic", "Thermal")
     ):
         fit.ship.multiplyItemAttr(
             "shield{0}DamageResonance".format(tgtResType),
diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/modesigradiuspostdiv.py
index 2b1dcfb881..7d3b690017 100644
--- a/eos/effects/modesigradiuspostdiv.py
+++ b/eos/effects/modesigradiuspostdiv.py
@@ -4,6 +4,8 @@
 # Module: Confessor Defense Mode
 # Module: Jackdaw Defense Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
                               stackingPenalties=True, penaltyGroup="postDiv")
diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/modevelocitypostdiv.py
index a781893c68..d7895a7001 100644
--- a/eos/effects/modevelocitypostdiv.py
+++ b/eos/effects/modevelocitypostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Propulsion Mode (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(
         "maxVelocity",
diff --git a/eos/effects/modifyactivearmorresonancepostpercent.py b/eos/effects/modifyactivearmorresonancepostpercent.py
index 3af14f8165..be8b613a89 100644
--- a/eos/effects/modifyactivearmorresonancepostpercent.py
+++ b/eos/effects/modifyactivearmorresonancepostpercent.py
@@ -4,6 +4,8 @@
 # Modules from group: Armor Hardener (156 of 156)
 # Modules from group: Flex Armor Hardener (4 of 4)
 type = "active"
+
+
 def handler(fit, module, context):
     for damageType in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
diff --git a/eos/effects/modifyactiveshieldresonancepostpercent.py b/eos/effects/modifyactiveshieldresonancepostpercent.py
index 8e78cc5397..41e70a776b 100644
--- a/eos/effects/modifyactiveshieldresonancepostpercent.py
+++ b/eos/effects/modifyactiveshieldresonancepostpercent.py
@@ -4,6 +4,8 @@
 # Modules from group: Flex Shield Hardener (5 of 5)
 # Modules from group: Shield Hardener (97 of 97)
 type = "active"
+
+
 def handler(fit, module, context):
     for damageType in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
diff --git a/eos/effects/modifyarmorresonancepassivepreassignment.py b/eos/effects/modifyarmorresonancepassivepreassignment.py
index 082ddf0a45..2316b8c190 100644
--- a/eos/effects/modifyarmorresonancepassivepreassignment.py
+++ b/eos/effects/modifyarmorresonancepassivepreassignment.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.preAssignItemAttr("armor{0}DamageResonance".format(type), module.getModifiedItemAttr("passiveArmor{0}DamageResonance".format(type)))
+        fit.ship.preAssignItemAttr("armor{0}DamageResonance".format(type),
+                                   module.getModifiedItemAttr("passiveArmor{0}DamageResonance".format(type)))
diff --git a/eos/effects/modifyarmorresonancepostpercent.py b/eos/effects/modifyarmorresonancepostpercent.py
index 4280c98499..f5316cb3ab 100644
--- a/eos/effects/modifyarmorresonancepostpercent.py
+++ b/eos/effects/modifyarmorresonancepostpercent.py
@@ -4,8 +4,10 @@
 # Modules from group: Armor Coating (202 of 202)
 # Modules from group: Armor Plating Energized (187 of 187)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("armor%sDamageResonance" % type.capitalize(),
                                module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties = True)
\ No newline at end of file
+                               stackingPenalties=True)
diff --git a/eos/effects/modifyarmorresonancepostpercentpassive.py b/eos/effects/modifyarmorresonancepostpercentpassive.py
index 56ddf5fe7a..3478f268fa 100644
--- a/eos/effects/modifyarmorresonancepostpercentpassive.py
+++ b/eos/effects/modifyarmorresonancepostpercentpassive.py
@@ -3,8 +3,10 @@
 # Used by:
 # Modules named like: Anti Pump (32 of 32)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("armor" + type.capitalize() + "DamageResonance",
                                module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py b/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py
index 413c9afae3..6f123d02cd 100644
--- a/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py
+++ b/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py
@@ -4,9 +4,11 @@
 # Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR (2 of 2)
 # Skill: Neurotoxin Recovery
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     for i in xrange(5):
-        attr = "boosterEffectChance{0}".format(i+1)
+        attr = "boosterEffectChance{0}".format(i + 1)
         fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
                                        attr, container.getModifiedItemAttr("boosterChanceBonus") * level)
diff --git a/eos/effects/modifyenergywarfareresistance.py b/eos/effects/modifyenergywarfareresistance.py
index e7aacdb743..8cffe13860 100644
--- a/eos/effects/modifyenergywarfareresistance.py
+++ b/eos/effects/modifyenergywarfareresistance.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Capacitor Battery (27 of 27)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("energyWarfareResistance",
-                               module.getModifiedItemAttr("energyWarfareResistanceBonus"),
-                               stackingPenalties = True)
+                           module.getModifiedItemAttr("energyWarfareResistanceBonus"),
+                           stackingPenalties=True)
diff --git a/eos/effects/modifymaxvelocityofshippassive.py b/eos/effects/modifymaxvelocityofshippassive.py
index 62670476a6..02ef1fc355 100644
--- a/eos/effects/modifymaxvelocityofshippassive.py
+++ b/eos/effects/modifymaxvelocityofshippassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Expanded Cargohold (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"),
-                              stackingPenalties = True)
\ No newline at end of file
+                              stackingPenalties=True)
diff --git a/eos/effects/modifypowerrechargerate.py b/eos/effects/modifypowerrechargerate.py
index c06cac1142..95814ce8c6 100644
--- a/eos/effects/modifypowerrechargerate.py
+++ b/eos/effects/modifypowerrechargerate.py
@@ -8,5 +8,7 @@
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Power Relay (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/modifyshieldrechargerate.py
index 845ba17887..2a1c209ad5 100644
--- a/eos/effects/modifyshieldrechargerate.py
+++ b/eos/effects/modifyshieldrechargerate.py
@@ -8,5 +8,7 @@
 # Modules named like: Flux Coil (12 of 12)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier") or 1)
diff --git a/eos/effects/modifyshieldrechargeratepassive.py b/eos/effects/modifyshieldrechargeratepassive.py
index d9edb75c1b..f669944159 100644
--- a/eos/effects/modifyshieldrechargeratepassive.py
+++ b/eos/effects/modifyshieldrechargeratepassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Processor Overclocking Unit (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier"))
diff --git a/eos/effects/modifyshieldresonancepassivepreassignment.py b/eos/effects/modifyshieldresonancepassivepreassignment.py
index 9df86f7804..62a3aaa3fa 100644
--- a/eos/effects/modifyshieldresonancepassivepreassignment.py
+++ b/eos/effects/modifyshieldresonancepassivepreassignment.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.preAssignItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("passiveShield{0}DamageResonance".format(type)))
+        fit.ship.preAssignItemAttr("shield{0}DamageResonance".format(type),
+                                   module.getModifiedItemAttr("passiveShield{0}DamageResonance".format(type)))
diff --git a/eos/effects/modifyshieldresonancepostpercent.py b/eos/effects/modifyshieldresonancepostpercent.py
index 3b2dcacb26..93125bf7ce 100644
--- a/eos/effects/modifyshieldresonancepostpercent.py
+++ b/eos/effects/modifyshieldresonancepostpercent.py
@@ -3,8 +3,10 @@
 # Used by:
 # Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("shield%sDamageResonance" % type.capitalize(),
                                module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties = True)
\ No newline at end of file
+                               stackingPenalties=True)
diff --git a/eos/effects/modifyshieldresonancepostpercentpassive.py b/eos/effects/modifyshieldresonancepostpercentpassive.py
index 683965b787..dfb7b35a8c 100644
--- a/eos/effects/modifyshieldresonancepostpercentpassive.py
+++ b/eos/effects/modifyshieldresonancepostpercentpassive.py
@@ -3,8 +3,10 @@
 # Used by:
 # Modules named like: Anti Screen Reinforcer (32 of 32)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         fit.ship.boostItemAttr("shield" + type.capitalize() + "DamageResonance",
                                module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/modifyshipagilitypassivepreassignment.py b/eos/effects/modifyshipagilitypassivepreassignment.py
index 7daab76950..e06ad8b514 100644
--- a/eos/effects/modifyshipagilitypassivepreassignment.py
+++ b/eos/effects/modifyshipagilitypassivepreassignment.py
@@ -4,5 +4,7 @@
 # Subsystems from group: Propulsion Systems (16 of 16)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.preAssignItemAttr("agility", module.getModifiedItemAttr("agility"))
diff --git a/eos/effects/modulebonusancillaryremotearmorrepairer.py b/eos/effects/modulebonusancillaryremotearmorrepairer.py
index ba176a64f1..c3c157b819 100644
--- a/eos/effects/modulebonusancillaryremotearmorrepairer.py
+++ b/eos/effects/modulebonusancillaryremotearmorrepairer.py
@@ -4,6 +4,8 @@
 # Modules from group: Ancillary Remote Armor Repairer (4 of 4)
 runTime = "late"
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
 
@@ -14,4 +16,4 @@ def handler(fit, module, context):
 
     amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
     speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("armorRepair", amount / speed)
\ No newline at end of file
+    fit.extraAttributes.increase("armorRepair", amount / speed)
diff --git a/eos/effects/modulebonusancillaryremoteshieldbooster.py b/eos/effects/modulebonusancillaryremoteshieldbooster.py
index 2aab65f2a6..74443b2696 100644
--- a/eos/effects/modulebonusancillaryremoteshieldbooster.py
+++ b/eos/effects/modulebonusancillaryremoteshieldbooster.py
@@ -4,8 +4,10 @@
 # Modules from group: Ancillary Remote Shield Booster (4 of 4)
 runTime = "late"
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     amount = module.getModifiedItemAttr("shieldBonus")
     speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
\ No newline at end of file
+    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py b/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py
index d537f13ceb..046f8f3efe 100644
--- a/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py
@@ -4,9 +4,13 @@
 # Variations of module: Armored Warfare Link - Damage Control I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairCapacitorNeed"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
+        "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py b/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py
index f83745ebf3..d1738a8033 100644
--- a/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py
@@ -4,11 +4,14 @@
 # Variations of module: Armored Warfare Link - Passive Defense I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorResistance"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
         fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py b/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py
index 9575779e42..382886520c 100644
--- a/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py
+++ b/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py
@@ -4,9 +4,13 @@
 # Variations of module: Armored Warfare Link - Rapid Repair I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairDuration"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "duration", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
+        "duration", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/modulebonusbastionmodule.py b/eos/effects/modulebonusbastionmodule.py
index 9151b73daf..09f0bd0080 100644
--- a/eos/effects/modulebonusbastionmodule.py
+++ b/eos/effects/modulebonusbastionmodule.py
@@ -4,6 +4,8 @@
 # Module: Bastion Module I
 type = "active"
 runTime = "early"
+
+
 def handler(fit, src, context):
     # Resistances
     for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
@@ -16,21 +18,21 @@ def handler(fit, src, context):
                                       stackingPenalties=penalize, penaltyGroup="preMul")
 
     # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \
-                                  mod.item.requiresSkill("Large Hybrid Turret") or \
-                                  mod.item.requiresSkill("Large Projectile Turret"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
+                                              mod.item.requiresSkill("Large Hybrid Turret") or
+                                              mod.item.requiresSkill("Large Projectile Turret"),
                                   "maxRange", src.getModifiedItemAttr("maxRangeBonus"),
                                   stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \
-                                  mod.item.requiresSkill("Large Hybrid Turret") or \
-                                  mod.item.requiresSkill("Large Projectile Turret"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
+                                              mod.item.requiresSkill("Large Hybrid Turret") or
+                                              mod.item.requiresSkill("Large Projectile Turret"),
                                   "falloff", src.getModifiedItemAttr("falloffBonus"),
                                   stackingPenalties=True)
 
     # Missiles
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \
-                                    mod.charge.requiresSkill("Cruise Missiles") or \
-                                    mod.charge.requiresSkill("Heavy Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or
+                                                mod.charge.requiresSkill("Cruise Missiles") or
+                                                mod.charge.requiresSkill("Heavy Missiles"),
                                     "maxVelocity", src.getModifiedItemAttr("missileVelocityBonus"))
 
     # Tanking
@@ -60,7 +62,8 @@ def handler(fit, src, context):
     fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
     fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
     fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght"))
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
+                                     "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght"))
     fit.ship.boostItemAttr("targetPainterResistance", src.getModifiedItemAttr("targetPainterResistanceBonus"))
     fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus"))
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
diff --git a/eos/effects/modulebonuscapitaldronedurabilityenhancer.py b/eos/effects/modulebonuscapitaldronedurabilityenhancer.py
index f8e4a8ab6a..754bbf2f14 100644
--- a/eos/effects/modulebonuscapitaldronedurabilityenhancer.py
+++ b/eos/effects/modulebonuscapitaldronedurabilityenhancer.py
@@ -3,9 +3,15 @@
 # Used by:
 # Variations of module: Capital Drone Durability Enhancer I (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("hullHpBonus"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("hullHpBonus"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
+                                 src.getModifiedItemAttr("hullHpBonus"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
+                                 src.getModifiedItemAttr("hullHpBonus"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
+                                 src.getModifiedItemAttr("hullHpBonus"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("hullHpBonus"))
     fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/modulebonuscapitaldronescopechip.py b/eos/effects/modulebonuscapitaldronescopechip.py
index 03337760f3..68be675209 100644
--- a/eos/effects/modulebonuscapitaldronescopechip.py
+++ b/eos/effects/modulebonuscapitaldronescopechip.py
@@ -3,9 +3,17 @@
 # Used by:
 # Variations of module: Capital Drone Scope Chip I (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange", src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange", src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
+                                 src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
+                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeOptimal",
+                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
     fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/modulebonuscapitaldronespeedaugmentor.py b/eos/effects/modulebonuscapitaldronespeedaugmentor.py
index 1fb64a6716..c98e001100 100644
--- a/eos/effects/modulebonuscapitaldronespeedaugmentor.py
+++ b/eos/effects/modulebonuscapitaldronespeedaugmentor.py
@@ -3,7 +3,11 @@
 # Used by:
 # Variations of module: Capital Drone Speed Augmentor I (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity", src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
+                                 src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
     fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/modulebonusdronedamageamplifier.py b/eos/effects/modulebonusdronedamageamplifier.py
index 09bb40dec4..f37ea4a1de 100644
--- a/eos/effects/modulebonusdronedamageamplifier.py
+++ b/eos/effects/modulebonusdronedamageamplifier.py
@@ -3,8 +3,17 @@
 # Used by:
 # Modules from group: Drone Damage Modules (11 of 11)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
+                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
diff --git a/eos/effects/modulebonusdronenavigationcomputer.py b/eos/effects/modulebonusdronenavigationcomputer.py
index 6cf0e71225..9c7f9e7778 100644
--- a/eos/effects/modulebonusdronenavigationcomputer.py
+++ b/eos/effects/modulebonusdronenavigationcomputer.py
@@ -3,6 +3,10 @@
 # Used by:
 # Modules from group: Drone Navigation Computer (8 of 8)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
+                                 src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
diff --git a/eos/effects/modulebonusfightersupportunit.py b/eos/effects/modulebonusfightersupportunit.py
index 3681f1c1cc..64906e62a6 100644
--- a/eos/effects/modulebonusfightersupportunit.py
+++ b/eos/effects/modulebonusfightersupportunit.py
@@ -3,10 +3,19 @@
 # Used by:
 # Modules from group: Fighter Support Unit (8 of 8)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDuration", src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration", src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration", src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate", src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDuration",
+                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
+                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
+                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
+                                   src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))
diff --git a/eos/effects/modulebonusinformationwarfarelinkelectronicsuperiority.py b/eos/effects/modulebonusinformationwarfarelinkelectronicsuperiority.py
index 1c99889aae..be7fdb9183 100644
--- a/eos/effects/modulebonusinformationwarfarelinkelectronicsuperiority.py
+++ b/eos/effects/modulebonusinformationwarfarelinkelectronicsuperiority.py
@@ -4,6 +4,7 @@
 # Variations of module: Information Warfare Link - Electronic Superiority I (2 of 2)
 type = "active"
 
+
 def handler(fit, module, context):
     module.multiplyItemAttr("commandBonusTD", module.getModifiedItemAttr("commandBonusHidden"))
     module.multiplyItemAttr("commandBonusECM", module.getModifiedItemAttr("commandBonusHidden"))
diff --git a/eos/effects/modulebonusinformationwarfarelinkreconoperation.py b/eos/effects/modulebonusinformationwarfarelinkreconoperation.py
index 123ab066eb..039caa229e 100644
--- a/eos/effects/modulebonusinformationwarfarelinkreconoperation.py
+++ b/eos/effects/modulebonusinformationwarfarelinkreconoperation.py
@@ -4,11 +4,14 @@
 # Variations of module: Information Warfare Link - Recon Operation I (2 of 2)
 type = "gang", "active"
 gangBoost = "electronicMaxRange"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Target Painter", "Weapon Disruptor", "Sensor Dampener", "ECM", "Burst Jammer")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py b/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py
index 49af64bfe1..e2c6d9c5ec 100644
--- a/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py
+++ b/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py
@@ -5,13 +5,16 @@
 type = "gang", "active"
 gangBoost = "maxTargetRange"
 gangBonus = "commandBonus"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("commandBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
     for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"):
         fit.ship.boostItemAttr("scan%sStrength" % scanType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
+                               stackingPenalties=True)
diff --git a/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py b/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py
index d86fbfc35b..933c1c72b9 100644
--- a/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py
+++ b/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py
@@ -4,10 +4,13 @@
 # Variations of module: Mining Foreman Link - Harvester Capacitor Efficiency I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningCapacitorNeed"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser",
               "Ice Harvester", "Gas Cloud Harvester")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "capacitorNeed", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/modulebonusminingforemanlinklaseroptimization.py b/eos/effects/modulebonusminingforemanlinklaseroptimization.py
index a1eb89913b..8c457d34c5 100644
--- a/eos/effects/modulebonusminingforemanlinklaseroptimization.py
+++ b/eos/effects/modulebonusminingforemanlinklaseroptimization.py
@@ -4,10 +4,13 @@
 # Variations of module: Mining Foreman Link - Laser Optimization I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningDuration"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser",
               "Ice Harvester", "Gas Cloud Harvester")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "duration", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py b/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py
index 8d47866bd7..d655adff83 100644
--- a/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py
+++ b/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py
@@ -4,10 +4,14 @@
 # Variations of module: Mining Foreman Link - Mining Laser Field Enhancement I (2 of 2)
 type = "gang", "active"
 gangBoost = "miningMaxRange"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Mining"),
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill(
+        "Ice Harvesting") or mod.item.requiresSkill("Mining"),
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
                                   "surveyScanRange", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/modulebonusnetworkedsensorarray.py b/eos/effects/modulebonusnetworkedsensorarray.py
index 7db715bfd3..fb58a59282 100644
--- a/eos/effects/modulebonusnetworkedsensorarray.py
+++ b/eos/effects/modulebonusnetworkedsensorarray.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Networked Sensor Array
 type = "active"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionBonus"), stackingPenalties=True)
 
@@ -10,7 +12,8 @@ def handler(fit, src, context):
         attr = "scan{}Strength".format(scanType)
         bonus = src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType))
         fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
-        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), attr, bonus, stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), attr, bonus,
+                                       stackingPenalties=True)
 
     # EW cap need increase
     groups = [
@@ -23,4 +26,4 @@ def handler(fit, src, context):
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
                                               mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
\ No newline at end of file
+                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
diff --git a/eos/effects/modulebonusomnidirectionaltrackingenhancer.py b/eos/effects/modulebonusomnidirectionaltrackingenhancer.py
index a19974d218..c6e8884e5b 100644
--- a/eos/effects/modulebonusomnidirectionaltrackingenhancer.py
+++ b/eos/effects/modulebonusomnidirectionaltrackingenhancer.py
@@ -3,17 +3,41 @@
 # Used by:
 # Modules from group: Drone Tracking Enhancer (10 of 10)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionRadius", src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionRadius", src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretTrackingSpeed", src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed", src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionVelocity", src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionVelocity", src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionRadius",
+                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionRadius",
+                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
+                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretTrackingSpeed",
+                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
+                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
+                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionVelocity",
+                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionVelocity",
+                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
+                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
diff --git a/eos/effects/modulebonusomnidirectionaltrackinglink.py b/eos/effects/modulebonusomnidirectionaltrackinglink.py
index d791b359bf..d589475bd4 100644
--- a/eos/effects/modulebonusomnidirectionaltrackinglink.py
+++ b/eos/effects/modulebonusomnidirectionaltrackinglink.py
@@ -3,17 +3,41 @@
 # Used by:
 # Modules from group: Drone Tracking Modules (10 of 10)
 type = "active"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionVelocity", src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed", src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionRadius", src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretTrackingSpeed", src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionRadius", src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionVelocity", src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
+                                   stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionVelocity",
+                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
+                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionRadius",
+                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretTrackingSpeed",
+                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionRadius",
+                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
+                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
+                                   stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
+                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionVelocity",
+                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
+                                   stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
+                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
+                                   stackingPenalties=True)
diff --git a/eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py b/eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py
index 4605d70c2d..cb4d4b21e3 100644
--- a/eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py
+++ b/eos/effects/modulebonusomnidirectionaltrackinglinkoverload.py
@@ -3,10 +3,12 @@
 # Used by:
 # Modules from group: Drone Tracking Modules (10 of 10)
 type = "overheat"
+
+
 def handler(fit, module, context):
     overloadBonus = module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus")
     module.boostItemAttr("maxRangeBonus", overloadBonus)
     module.boostItemAttr("falloffBonus", overloadBonus)
     module.boostItemAttr("trackingSpeedBonus", overloadBonus)
     module.boostItemAttr("aoeCloudSizeBonus", overloadBonus)
-    module.boostItemAttr("aoeVelocityBonus", overloadBonus)
\ No newline at end of file
+    module.boostItemAttr("aoeVelocityBonus", overloadBonus)
diff --git a/eos/effects/modulebonussiegemodule.py b/eos/effects/modulebonussiegemodule.py
index bb5258be6a..c63e33440a 100644
--- a/eos/effects/modulebonussiegemodule.py
+++ b/eos/effects/modulebonussiegemodule.py
@@ -4,23 +4,25 @@
 # Variations of module: Siege Module I (2 of 2)
 type = "active"
 runTime = "early"
+
+
 def handler(fit, src, context):
-    #Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \
-                                  mod.item.requiresSkill("Capital Hybrid Turret") or \
-                                  mod.item.requiresSkill("Capital Projectile Turret"),
+    # Turrets
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or
+                                              mod.item.requiresSkill("Capital Hybrid Turret") or
+                                              mod.item.requiresSkill("Capital Projectile Turret"),
                                   "damageMultiplier", src.getModifiedItemAttr("siegeTurretDamageBonus"))
 
-    #Missiles
+    # Missiles
     for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \
-                                        mod.charge.requiresSkill("XL Cruise Missiles") or \
-                                        mod.charge.requiresSkill("Torpedoes"),
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or
+                                                    mod.charge.requiresSkill("XL Cruise Missiles") or
+                                                    mod.charge.requiresSkill("Torpedoes"),
                                         "%sDamage" % type, src.getModifiedItemAttr("siegeMissileDamageBonus"))
 
     # Reppers
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or \
-                                  mod.item.requiresSkill("Capital Repair Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or
+                                              mod.item.requiresSkill("Capital Repair Systems"),
                                   "duration", src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
@@ -31,24 +33,26 @@ def handler(fit, src, context):
                                   "armorDamageAmount", src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"),
                                   stackingPenalties=True)
 
-    #Speed penalty
+    # Speed penalty
     fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"))
 
-    #Mass
+    # Mass
     fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"),
                               stackingPenalties=True, penaltyGroup="postMul")
 
     # @ todo: test for April 2016 release
-    #Block Hostile EWAR and friendly effects
+    # Block Hostile EWAR and friendly effects
     fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
     # missile ROF bonus
     for group in ("Missile Launcher XL Torpedo", "Missile Launcher Rapid Torpedo", "Missile Launcher XL Cruise"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed", src.getModifiedItemAttr("siegeLauncherROFBonus"))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed",
+                                      src.getModifiedItemAttr("siegeLauncherROFBonus"))
 
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity", src.getModifiedItemAttr("siegeTorpedoVelocityBonus"), stackingPenalties=True)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
+                                    src.getModifiedItemAttr("siegeTorpedoVelocityBonus"), stackingPenalties=True)
 
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
     fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
diff --git a/eos/effects/modulebonussiegewarfarelinkactiveshielding.py b/eos/effects/modulebonussiegewarfarelinkactiveshielding.py
index a24ddcedc5..7190f52400 100644
--- a/eos/effects/modulebonussiegewarfarelinkactiveshielding.py
+++ b/eos/effects/modulebonussiegewarfarelinkactiveshielding.py
@@ -4,9 +4,13 @@
 # Variations of module: Siege Warfare Link - Active Shielding I (2 of 2)
 type = "gang", "active"
 gangBoost = "shieldRepairDuration"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
-                                  "duration", module.getModifiedItemAttr("commandBonus"))
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
+        "duration", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py b/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py
index 52f0d64d03..d01e051684 100644
--- a/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py
+++ b/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py
@@ -4,9 +4,13 @@
 # Variations of module: Siege Warfare Link - Shield Efficiency I (2 of 2)
 type = "gang", "active"
 gangBoost = "shieldRepairCapacitorNeed"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
-        "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
\ No newline at end of file
+    if "gang" not in context:
+        return
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"),
+        "capacitorNeed", module.getModifiedItemAttr("commandBonus"))
diff --git a/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py b/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py
index 663a7ecc0f..35a7df928d 100644
--- a/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py
+++ b/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py
@@ -3,12 +3,15 @@
 # Used by:
 # Variations of module: Siege Warfare Link - Shield Harmonizing I (2 of 2)
 type = "gang", "active"
-#runTime = "late"
+# runTime = "late"
 
 gangBoost = "shieldResistance"
+
+
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     for damageType in ("Em", "Explosive", "Thermal", "Kinetic"):
         fit.ship.boostItemAttr("shield%sDamageResonance" % damageType,
                                module.getModifiedItemAttr("commandBonus"),
-                               stackingPenalties = True)
\ No newline at end of file
+                               stackingPenalties=True)
diff --git a/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py b/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py
index 615ec0e106..2e62234aef 100644
--- a/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py
+++ b/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py
@@ -4,9 +4,12 @@
 # Variations of module: Skirmish Warfare Link - Evasive Maneuvers I (2 of 2)
 type = "gang", "active"
 gangBoost = "signatureRadius"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("commandBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py b/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py
index ac68971132..ddf4ce6f77 100644
--- a/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py
+++ b/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py
@@ -4,11 +4,14 @@
 # Variations of module: Skirmish Warfare Link - Interdiction Maneuvers I (2 of 2)
 type = "gang", "active"
 gangBoost = "interdictionMaxRange"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     groups = ("Stasis Web", "Warp Scrambler")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py b/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py
index f267377115..0675241d31 100644
--- a/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py
+++ b/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py
@@ -4,10 +4,13 @@
 # Variations of module: Skirmish Warfare Link - Rapid Deployment I (2 of 2)
 type = "gang", "active"
 gangBoost = "speedFactor"
-#runTime = "late"
+
+
+# runTime = "late"
 
 def handler(fit, module, context):
-    if "gang" not in context: return
+    if "gang" not in context:
+        return
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "speedFactor", module.getModifiedItemAttr("commandBonus"),
                                   stackingPenalties=True)
diff --git a/eos/effects/modulebonustriagemodule.py b/eos/effects/modulebonustriagemodule.py
index 30384fdb26..3474de5944 100644
--- a/eos/effects/modulebonustriagemodule.py
+++ b/eos/effects/modulebonustriagemodule.py
@@ -4,31 +4,40 @@
 # Variations of module: Triage Module I (2 of 2)
 type = "active"
 runTime = "early"
+
+
 def handler(fit, src, context):
     # Remote effect bonuses (duration / amount / range / fallout)
     for skill, amtAttr, stack in (
-                ("Capital Remote Armor Repair Systems", "armorDamageAmount", True),
-                ("Capital Shield Emission Systems", "shieldBonus", True),
-                ("Capital Capacitor Emission Systems", "powerTransferAmount", False),
-                ("Capital Remote Hull Repair Systems", "structureDamageAmount", False)):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration", src.getModifiedItemAttr("siegeRemoteLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr, src.getModifiedItemAttr("siegeRemoteLogisticsAmountBonus"), stackingPenalties=stack)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "maxRange", src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "falloffEffectiveness", src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
+            ("Capital Remote Armor Repair Systems", "armorDamageAmount", True),
+            ("Capital Shield Emission Systems", "shieldBonus", True),
+            ("Capital Capacitor Emission Systems", "powerTransferAmount", False),
+            ("Capital Remote Hull Repair Systems", "structureDamageAmount", False)):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
+                                      src.getModifiedItemAttr("siegeRemoteLogisticsDurationBonus"))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                      src.getModifiedItemAttr("siegeRemoteLogisticsAmountBonus"),
+                                      stackingPenalties=stack)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "maxRange",
+                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "falloffEffectiveness",
+                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
 
     # Local armor/shield rep effects (duration / amoutn)
     for skill, amtAttr in (
             ("Capital Shield Operation", "shieldBonus"),
             ("Capital Repair Systems", "armorDamageAmount")):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration", src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr, src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"))
-
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
+                                      src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                      src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"))
 
     # Speed bonus
     fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
 
     # Scan resolution multiplier
-    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"), stackingPenalties=True)
+    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"),
+                              stackingPenalties=True)
 
     # Mass multiplier
     fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"), stackingPenalties=True)
@@ -36,13 +45,12 @@ def handler(fit, src, context):
     # Max locked targets
     fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
 
-
     # EW cap need increase
     groups = [
         'Burst Jammer',
         'Weapon Disruptor',
         'ECM',
-		'Stasis Grappler',
+        'Stasis Grappler',
         'Sensor Dampener',
         'Target Painter']
 
@@ -56,7 +64,8 @@ def handler(fit, src, context):
     fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
 
     # new in April 2016 release
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
+                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
 
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
     fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/mwdsignatureradiusrolebonus.py
index ff3fd7530b..2c5ce0bbc5 100644
--- a/eos/effects/mwdsignatureradiusrolebonus.py
+++ b/eos/effects/mwdsignatureradiusrolebonus.py
@@ -5,6 +5,8 @@
 # Ships from group: Command Destroyer (4 of 4)
 # Ships from group: Heavy Assault Cruiser (8 of 11)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
                                   "signatureRadiusBonus", ship.getModifiedItemAttr("MWDSignatureRadiusBonus"))
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
index bde3d06c5f..143f840762 100644
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocitylocationship.py
@@ -4,5 +4,7 @@
 # Implant: Low-grade Snake Alpha
 # Implant: Mid-grade Snake Alpha
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus"))
\ No newline at end of file
+    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus"))
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
index 19cb4e928f..8f1435f81f 100644
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -7,8 +7,10 @@
 # Implant: Quafe Zero
 # Skill: Navigation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     amount = container.getModifiedItemAttr("velocityBonus") or 0
     fit.ship.boostItemAttr("maxVelocity", amount * level,
-                           stackingPenalties = "skill" not in context and "implant" not in context and "booster" not in context)
+                           stackingPenalties="skill" not in context and "implant" not in context and "booster" not in context)
diff --git a/eos/effects/offensivedefensivereduction.py b/eos/effects/offensivedefensivereduction.py
index 43ae14ed57..39c120f49d 100644
--- a/eos/effects/offensivedefensivereduction.py
+++ b/eos/effects/offensivedefensivereduction.py
@@ -5,15 +5,19 @@
 # Celestials named like: Incursion ship attributes effects (3 of 3)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     damages = ("em", "thermal", "kinetic", "explosive")
     for damage in damages:
         # Nerf missile damage
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        "{0}Damage".format(damage), beacon.getModifiedItemAttr("systemEffectDamageReduction"))
+                                        "{0}Damage".format(damage),
+                                        beacon.getModifiedItemAttr("systemEffectDamageReduction"))
         # Nerf smartbomb damage
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Smart Bomb",
-                                      "{0}Damage".format(damage), beacon.getModifiedItemAttr("systemEffectDamageReduction"))
+                                      "{0}Damage".format(damage),
+                                      beacon.getModifiedItemAttr("systemEffectDamageReduction"))
         # Nerf armor resistances
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(damage.capitalize()),
                                beacon.getModifiedItemAttr("armor{0}DamageResistanceBonus".format(damage.capitalize())))
diff --git a/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py b/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py
index b9ef93dce5..55e0cb883b 100644
--- a/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py
+++ b/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py
@@ -4,5 +4,8 @@
 # Modules from group: Jump Drive Economizer (3 of 3)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", module.getModifiedItemAttr("consumptionQuantityBonusPercentage"), stackingPenalties=True)
+    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
+                           module.getModifiedItemAttr("consumptionQuantityBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/orecapitalshipshieldtransferfalloff.py b/eos/effects/orecapitalshipshieldtransferfalloff.py
index b1c8702eb5..e339dc02d1 100644
--- a/eos/effects/orecapitalshipshieldtransferfalloff.py
+++ b/eos/effects/orecapitalshipshieldtransferfalloff.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusORECapital3"),
+                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/orecapitalshipshieldtransferrange.py b/eos/effects/orecapitalshipshieldtransferrange.py
index 401ad2472f..f9d1b0e0ba 100644
--- a/eos/effects/orecapitalshipshieldtransferrange.py
+++ b/eos/effects/orecapitalshipshieldtransferrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusORECapital3"),
+                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py
index 8da5776ab6..00b444c0d5 100644
--- a/eos/effects/overloadrofbonus.py
+++ b/eos/effects/overloadrofbonus.py
@@ -5,5 +5,7 @@
 # Items from market group: Ship Equipment > Turrets & Bays (428 of 848)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))
diff --git a/eos/effects/overloadselfarmordamageamountdurationbonus.py b/eos/effects/overloadselfarmordamageamountdurationbonus.py
index edf684b561..3545e6dabb 100644
--- a/eos/effects/overloadselfarmordamageamountdurationbonus.py
+++ b/eos/effects/overloadselfarmordamageamountdurationbonus.py
@@ -4,6 +4,9 @@
 # Modules from group: Ancillary Armor Repairer (4 of 4)
 # Modules from group: Armor Repair Unit (105 of 105)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"), stackingPenalties=True)
+    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"),
+                         stackingPenalties=True)
diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py
index 0ff334285b..1be80b9665 100644
--- a/eos/effects/overloadselfdamagebonus.py
+++ b/eos/effects/overloadselfdamagebonus.py
@@ -5,5 +5,7 @@
 # Modules from group: Hybrid Weapon (105 of 221)
 # Modules from group: Projectile Weapon (99 of 165)
 type = "overheat"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
\ No newline at end of file
+    module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index e9ddd05964..757ba6d76a 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -16,5 +16,7 @@
 # Module: Reactive Armor Hardener
 # Module: Target Spectrum Breaker
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus") or 0)
diff --git a/eos/effects/overloadselfecmstrenghtbonus.py b/eos/effects/overloadselfecmstrenghtbonus.py
index e8ee745673..f39a5eed1c 100644
--- a/eos/effects/overloadselfecmstrenghtbonus.py
+++ b/eos/effects/overloadselfecmstrenghtbonus.py
@@ -4,9 +4,11 @@
 # Modules from group: Burst Jammer (11 of 11)
 # Modules from group: ECM (39 of 39)
 type = "overheat"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
             module.boostItemAttr("scan{0}StrengthBonus".format(scanType),
                                  module.getModifiedItemAttr("overloadECMStrengthBonus"),
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
diff --git a/eos/effects/overloadselfemhardeningbonus.py b/eos/effects/overloadselfemhardeningbonus.py
index c1ceb50632..7e6cc61665 100644
--- a/eos/effects/overloadselfemhardeningbonus.py
+++ b/eos/effects/overloadselfemhardeningbonus.py
@@ -5,5 +5,7 @@
 # Variations of module: EM Ward Field I (19 of 19)
 # Module: Civilian EM Ward Field
 type = "overheat"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("emDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
\ No newline at end of file
+    module.boostItemAttr("emDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/overloadselfexplosivehardeningbonus.py b/eos/effects/overloadselfexplosivehardeningbonus.py
index 22409fdeb7..9762eaf145 100644
--- a/eos/effects/overloadselfexplosivehardeningbonus.py
+++ b/eos/effects/overloadselfexplosivehardeningbonus.py
@@ -5,5 +5,7 @@
 # Variations of module: Explosive Deflection Field I (19 of 19)
 # Module: Civilian Explosive Deflection Field
 type = "overheat"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("explosiveDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
\ No newline at end of file
+    module.boostItemAttr("explosiveDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/overloadselfhardeninginvulnerabilitybonus.py b/eos/effects/overloadselfhardeninginvulnerabilitybonus.py
index c044987b22..59e6a1575f 100644
--- a/eos/effects/overloadselfhardeninginvulnerabilitybonus.py
+++ b/eos/effects/overloadselfhardeninginvulnerabilitybonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Capital Flex Hardener (9 of 9)
 # Variations of module: Adaptive Invulnerability Field I (17 of 17)
 type = "overheat"
+
+
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         module.boostItemAttr("%sDamageResistanceBonus" % type,
diff --git a/eos/effects/overloadselfkinetichardeningbonus.py b/eos/effects/overloadselfkinetichardeningbonus.py
index a82dc7a5ae..549ddf5e7a 100644
--- a/eos/effects/overloadselfkinetichardeningbonus.py
+++ b/eos/effects/overloadselfkinetichardeningbonus.py
@@ -5,5 +5,7 @@
 # Variations of module: Kinetic Deflection Field I (19 of 19)
 # Module: Civilian Kinetic Deflection Field
 type = "overheat"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("kineticDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
\ No newline at end of file
+    module.boostItemAttr("kineticDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/overloadselfmissileguidancebonus5.py b/eos/effects/overloadselfmissileguidancebonus5.py
index 0f99c49654..3067ed1fd2 100644
--- a/eos/effects/overloadselfmissileguidancebonus5.py
+++ b/eos/effects/overloadselfmissileguidancebonus5.py
@@ -3,12 +3,14 @@
 # Used by:
 # Modules from group: Missile Guidance Computer (3 of 3)
 type = "overheat"
+
+
 def handler(fit, module, context):
     for tgtAttr in (
-        "aoeCloudSizeBonus",
-        "explosionDelayBonus",
-        "missileVelocityBonus",
-        "maxVelocityBonus",
-        "aoeVelocityBonus"
+            "aoeCloudSizeBonus",
+            "explosionDelayBonus",
+            "missileVelocityBonus",
+            "maxVelocityBonus",
+            "aoeVelocityBonus"
     ):
         module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/overloadselfmissileguidancemodulebonus.py b/eos/effects/overloadselfmissileguidancemodulebonus.py
index da798b80ba..3a8a9ab52d 100644
--- a/eos/effects/overloadselfmissileguidancemodulebonus.py
+++ b/eos/effects/overloadselfmissileguidancemodulebonus.py
@@ -3,11 +3,13 @@
 # Used by:
 # Variations of module: Guidance Disruptor I (6 of 6)
 type = "overheat"
+
+
 def handler(fit, module, context):
     for tgtAttr in (
-        "aoeCloudSizeBonus",
-        "explosionDelayBonus",
-        "missileVelocityBonus",
-        "aoeVelocityBonus"
+            "aoeCloudSizeBonus",
+            "explosionDelayBonus",
+            "missileVelocityBonus",
+            "aoeVelocityBonus"
     ):
-        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
\ No newline at end of file
+        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/overloadselfpainterbonus.py b/eos/effects/overloadselfpainterbonus.py
index 11f9a96a9c..67b69fc55d 100644
--- a/eos/effects/overloadselfpainterbonus.py
+++ b/eos/effects/overloadselfpainterbonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Target Painter (8 of 8)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("signatureRadiusBonus", module.getModifiedItemAttr("overloadPainterStrengthBonus") or 0)
diff --git a/eos/effects/overloadselfrangebonus.py b/eos/effects/overloadselfrangebonus.py
index eb2b4e3704..f306a064f5 100644
--- a/eos/effects/overloadselfrangebonus.py
+++ b/eos/effects/overloadselfrangebonus.py
@@ -5,6 +5,8 @@
 # Modules from group: Stasis Web (18 of 18)
 # Modules from group: Warp Scrambler (52 of 53)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("maxRange", module.getModifiedItemAttr("overloadRangeBonus"),
-                         stackingPenalties = True)
\ No newline at end of file
+                         stackingPenalties=True)
diff --git a/eos/effects/overloadselfsensormodulebonus.py b/eos/effects/overloadselfsensormodulebonus.py
index 303bebdf33..378e739b13 100644
--- a/eos/effects/overloadselfsensormodulebonus.py
+++ b/eos/effects/overloadselfsensormodulebonus.py
@@ -5,6 +5,8 @@
 # Modules from group: Sensor Booster (16 of 16)
 # Modules from group: Sensor Dampener (6 of 6)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))
     module.boostItemAttr("scanResolutionBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
diff --git a/eos/effects/overloadselfshieldbonusdurationbonus.py b/eos/effects/overloadselfshieldbonusdurationbonus.py
index 05d89029d3..cc833be683 100644
--- a/eos/effects/overloadselfshieldbonusdurationbonus.py
+++ b/eos/effects/overloadselfshieldbonusdurationbonus.py
@@ -4,6 +4,8 @@
 # Modules from group: Ancillary Shield Booster (5 of 5)
 # Modules from group: Shield Booster (93 of 93)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
     module.boostItemAttr("shieldBonus", module.getModifiedItemAttr("overloadShieldBonus"), stackingPenalties=True)
diff --git a/eos/effects/overloadselfspeedbonus.py b/eos/effects/overloadselfspeedbonus.py
index 7b5d7bb5a1..c7ee81a907 100644
--- a/eos/effects/overloadselfspeedbonus.py
+++ b/eos/effects/overloadselfspeedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Propulsion Module (127 of 127)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("speedFactor", module.getModifiedItemAttr("overloadSpeedFactorBonus"),
                          stackingPenalties=True)
diff --git a/eos/effects/overloadselfthermalhardeningbonus.py b/eos/effects/overloadselfthermalhardeningbonus.py
index 5a40369802..a97ab16fb4 100644
--- a/eos/effects/overloadselfthermalhardeningbonus.py
+++ b/eos/effects/overloadselfthermalhardeningbonus.py
@@ -5,5 +5,7 @@
 # Variations of module: Thermal Dissipation Field I (19 of 19)
 # Module: Civilian Thermal Dissipation Field
 type = "overheat"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("thermalDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
\ No newline at end of file
+    module.boostItemAttr("thermalDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/overloadselftrackingmodulebonus.py
index bb7c7481b5..fb217b93da 100644
--- a/eos/effects/overloadselftrackingmodulebonus.py
+++ b/eos/effects/overloadselftrackingmodulebonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Tracking Computer (19 of 19)
 # Variations of module: Tracking Disruptor I (6 of 6)
 type = "overheat"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
     module.boostItemAttr("falloffBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/passivespeedlimit.py b/eos/effects/passivespeedlimit.py
index 95e8328731..c8744ddcf9 100644
--- a/eos/effects/passivespeedlimit.py
+++ b/eos/effects/passivespeedlimit.py
@@ -4,5 +4,7 @@
 # Modules from group: Entosis Link (6 of 6)
 runtime = "late"
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr("speedLimit")
diff --git a/eos/effects/pointdefense.py b/eos/effects/pointdefense.py
index 45ca33f3fc..4f2324035b 100644
--- a/eos/effects/pointdefense.py
+++ b/eos/effects/pointdefense.py
@@ -1,4 +1,6 @@
 # Not used by any item
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/powerbooster.py b/eos/effects/powerbooster.py
index 6f23f7df31..6fdafc9a48 100644
--- a/eos/effects/powerbooster.py
+++ b/eos/effects/powerbooster.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Capacitor Booster (59 of 59)
 type = "active"
+
+
 def handler(fit, module, context):
     # Set reload time to 10 seconds
     module.reloadTime = 10000
diff --git a/eos/effects/powerincrease.py b/eos/effects/powerincrease.py
index edc73bbad3..2d953deb47 100644
--- a/eos/effects/powerincrease.py
+++ b/eos/effects/powerincrease.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Auxiliary Power Core (5 of 5)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerIncrease"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerIncrease"))
diff --git a/eos/effects/poweroutputaddpassive.py b/eos/effects/poweroutputaddpassive.py
index 772d9568fa..6fff952b7d 100644
--- a/eos/effects/poweroutputaddpassive.py
+++ b/eos/effects/poweroutputaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Items from category: Subsystem (40 of 80)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerOutput"))
diff --git a/eos/effects/poweroutputmultiply.py b/eos/effects/poweroutputmultiply.py
index 9d3f66082f..3a0e5c6a14 100644
--- a/eos/effects/poweroutputmultiply.py
+++ b/eos/effects/poweroutputmultiply.py
@@ -6,5 +6,7 @@
 # Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("powerOutput", module.getModifiedItemAttr("powerOutputMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("powerOutput", module.getModifiedItemAttr("powerOutputMultiplier"))
diff --git a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
index 99cbeb9b7f..c52784fa93 100644
--- a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
+++ b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Tactical Destroyer (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
-                                     "cpu", ship.getModifiedItemAttr("roleBonusTacticalDestroyer1"))
+                                  "cpu", ship.getModifiedItemAttr("roleBonusTacticalDestroyer1"))
diff --git a/eos/effects/projectilefired.py b/eos/effects/projectilefired.py
index 0de9601c2b..491b73f0c4 100644
--- a/eos/effects/projectilefired.py
+++ b/eos/effects/projectilefired.py
@@ -4,6 +4,8 @@
 # Modules from group: Hybrid Weapon (221 of 221)
 # Modules from group: Projectile Weapon (165 of 165)
 type = 'active'
+
+
 def handler(fit, module, context):
     rt = module.getModifiedItemAttr("reloadTime")
     if not rt:
diff --git a/eos/effects/projectileweapondamagemultiply.py b/eos/effects/projectileweapondamagemultiply.py
index c0ea833341..bb6bbfda8d 100644
--- a/eos/effects/projectileweapondamagemultiply.py
+++ b/eos/effects/projectileweapondamagemultiply.py
@@ -5,7 +5,9 @@
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
+                                     stackingPenalties=True)
diff --git a/eos/effects/projectileweapondamagemultiplypassive.py b/eos/effects/projectileweapondamagemultiplypassive.py
index c2c214905a..0060dafc81 100644
--- a/eos/effects/projectileweapondamagemultiplypassive.py
+++ b/eos/effects/projectileweapondamagemultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Projectile Collision Accelerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                  stackingPenalties = True)
\ No newline at end of file
+                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
+                                     stackingPenalties=True)
diff --git a/eos/effects/projectileweaponspeedmultiply.py b/eos/effects/projectileweaponspeedmultiply.py
index 805fbf3fe5..1a7ce802eb 100644
--- a/eos/effects/projectileweaponspeedmultiply.py
+++ b/eos/effects/projectileweaponspeedmultiply.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Gyrostabilizer (12 of 12)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/projectileweaponspeedmultiplypassive.py b/eos/effects/projectileweaponspeedmultiplypassive.py
index 575dc0323d..6a1b54d156 100644
--- a/eos/effects/projectileweaponspeedmultiplypassive.py
+++ b/eos/effects/projectileweaponspeedmultiplypassive.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Projectile Burst Aerator (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
                                      "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties = True)
\ No newline at end of file
+                                     stackingPenalties=True)
diff --git a/eos/effects/propulsionskillcapneedbonusskilllevel.py b/eos/effects/propulsionskillcapneedbonusskilllevel.py
index 388e6603ef..04a0f10bf6 100644
--- a/eos/effects/propulsionskillcapneedbonusskilllevel.py
+++ b/eos/effects/propulsionskillcapneedbonusskilllevel.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gypsy' Propulsion Jamming PJ (6 of 6)
 # Skill: Propulsion Jamming
 type = "passive"
+
+
 def handler(fit, container, context):
     groups = ("Stasis Web", "Stasis Grappler", "Warp Scrambler", "Warp Disrupt Field Generator")
     level = container.level if "skill" in context else 1
diff --git a/eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py b/eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
index 4b1efac308..fa09942059 100644
--- a/eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/rapidfiringrofbonuspostpercentspeedlocationshipmodulesrequiringgunnery.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Rapid Firing
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
\ No newline at end of file
+                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/rechargerateaddpassive.py b/eos/effects/rechargerateaddpassive.py
index b43f12f46e..93f6bb8ab2 100644
--- a/eos/effects/rechargerateaddpassive.py
+++ b/eos/effects/rechargerateaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Engineering Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("rechargeRate", module.getModifiedItemAttr("rechargeRate"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("rechargeRate", module.getModifiedItemAttr("rechargeRate"))
diff --git a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
index 15c177712f..c80bdc346c 100644
--- a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
+++ b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py
@@ -5,6 +5,8 @@
 type = "gang"
 gangBoost = "maxTargetRange"
 gangBonus = "maxTargetRangeBonus"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level, stackingPenalties = True    )
+    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level, stackingPenalties=True)
diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py
index e302d47ce8..602efab287 100644
--- a/eos/effects/reconshipcloakcpubonus1.py
+++ b/eos/effects/reconshipcloakcpubonus1.py
@@ -4,6 +4,8 @@
 # Ships from group: Force Recon Ship (6 of 6)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
                                   "cpu", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/remotearmorpowerneedbonuseffect.py b/eos/effects/remotearmorpowerneedbonuseffect.py
index 9940ffe884..ff0c38c0da 100644
--- a/eos/effects/remotearmorpowerneedbonuseffect.py
+++ b/eos/effects/remotearmorpowerneedbonuseffect.py
@@ -4,5 +4,8 @@
 # Ship: Guardian
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("remoteArmorPowerNeedBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power",
+                                  src.getModifiedItemAttr("remoteArmorPowerNeedBonus"))
diff --git a/eos/effects/remotearmorrepairentity.py b/eos/effects/remotearmorrepairentity.py
index 4b4b049fce..810b9a32c1 100644
--- a/eos/effects/remotearmorrepairentity.py
+++ b/eos/effects/remotearmorrepairentity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Drones named like: Armor Maintenance Bot (6 of 6)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("armorDamageAmount")
diff --git a/eos/effects/remotearmorrepairfalloff.py b/eos/effects/remotearmorrepairfalloff.py
index 6a1849234d..e20db1af6a 100644
--- a/eos/effects/remotearmorrepairfalloff.py
+++ b/eos/effects/remotearmorrepairfalloff.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Remote Armor Repairer (39 of 39)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("armorDamageAmount")
diff --git a/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py b/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py
index f454835e2e..73ff83db6c 100644
--- a/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py
+++ b/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py
@@ -5,6 +5,8 @@
 # Modules named like: Remote Repair Augmentor (6 of 8)
 # Skill: Remote Armor Repair Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
diff --git a/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
index b55a1c8b10..233a0e2c27 100644
--- a/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
+++ b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Logistics (3 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                   "power", ship.getModifiedItemAttr("powerTransferPowerNeedBonus"))
diff --git a/eos/effects/remoteecmburst.py b/eos/effects/remoteecmburst.py
index 45ca33f3fc..4f2324035b 100644
--- a/eos/effects/remoteecmburst.py
+++ b/eos/effects/remoteecmburst.py
@@ -1,4 +1,6 @@
 # Not used by any item
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/remoteecmfalloff.py b/eos/effects/remoteecmfalloff.py
index 9945eb020f..3778879922 100644
--- a/eos/effects/remoteecmfalloff.py
+++ b/eos/effects/remoteecmfalloff.py
@@ -3,9 +3,11 @@
 # Used by:
 # Modules from group: ECM (39 of 39)
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
 
         fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/remoteenergytransferfalloff.py b/eos/effects/remoteenergytransferfalloff.py
index f618d3d3cc..258a71817b 100644
--- a/eos/effects/remoteenergytransferfalloff.py
+++ b/eos/effects/remoteenergytransferfalloff.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Remote Capacitor Transmitter (41 of 41)
 type = "projected", "active"
+
+
 def handler(fit, src, context):
     if "projected" in context:
         amount = src.getModifiedItemAttr("powerTransferAmount")
diff --git a/eos/effects/remoteguidancedisruptfalloff.py b/eos/effects/remoteguidancedisruptfalloff.py
index ede3f06f59..5dfbeba413 100644
--- a/eos/effects/remoteguidancedisruptfalloff.py
+++ b/eos/effects/remoteguidancedisruptfalloff.py
@@ -4,14 +4,15 @@
 # Variations of module: Guidance Disruptor I (6 of 6)
 type = "active", "projected"
 
+
 def handler(fit, module, context):
     if "projected" in context:
         for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
+                ("aoeCloudSizeBonus", "aoeCloudSize"),
+                ("aoeVelocityBonus", "aoeVelocity"),
+                ("missileVelocityBonus", "maxVelocity"),
+                ("explosionDelayBonus", "explosionDelay"),
         ):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True, remoteResists=True)
+                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotehullrepair.py b/eos/effects/remotehullrepair.py
index 84ee642902..099e0c2ac3 100644
--- a/eos/effects/remotehullrepair.py
+++ b/eos/effects/remotehullrepair.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "projected", "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     bonus = module.getModifiedItemAttr("structureDamageAmount")
diff --git a/eos/effects/remotehullrepairentity.py b/eos/effects/remotehullrepairentity.py
index 4f41aec228..db8de5fe4a 100644
--- a/eos/effects/remotehullrepairentity.py
+++ b/eos/effects/remotehullrepairentity.py
@@ -4,6 +4,8 @@
 # Drones named like: Hull Maintenance Bot (6 of 6)
 type = "projected", "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     bonus = module.getModifiedItemAttr("structureDamageAmount")
diff --git a/eos/effects/remotehullrepairfalloff.py b/eos/effects/remotehullrepairfalloff.py
index 94dc050c7b..d7344b646b 100644
--- a/eos/effects/remotehullrepairfalloff.py
+++ b/eos/effects/remotehullrepairfalloff.py
@@ -4,6 +4,8 @@
 # Modules from group: Remote Hull Repairer (8 of 8)
 type = "projected", "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     bonus = module.getModifiedItemAttr("structureDamageAmount")
diff --git a/eos/effects/remotesensorboostfalloff.py b/eos/effects/remotesensorboostfalloff.py
index 1453fe2bca..a649c80e43 100644
--- a/eos/effects/remotesensorboostfalloff.py
+++ b/eos/effects/remotesensorboostfalloff.py
@@ -2,15 +2,17 @@
 #
 # Used by:
 # Modules from group: Remote Sensor Booster (8 of 8)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         return
 
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
 
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         fit.ship.boostItemAttr(
diff --git a/eos/effects/remotesensordampentity.py b/eos/effects/remotesensordampentity.py
index 2176a5a51f..adb0b1ac34 100644
--- a/eos/effects/remotesensordampentity.py
+++ b/eos/effects/remotesensordampentity.py
@@ -2,13 +2,15 @@
 #
 # Used by:
 # Drones named like: SD (3 of 3)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         return
 
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
 
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotesensordampfalloff.py b/eos/effects/remotesensordampfalloff.py
index 0339ee1968..e04b573c1b 100644
--- a/eos/effects/remotesensordampfalloff.py
+++ b/eos/effects/remotesensordampfalloff.py
@@ -2,13 +2,15 @@
 #
 # Used by:
 # Modules from group: Sensor Dampener (6 of 6)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         return
 
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
 
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remoteshieldtransferentity.py b/eos/effects/remoteshieldtransferentity.py
index 7a1fb0e20f..b4cce3bced 100644
--- a/eos/effects/remoteshieldtransferentity.py
+++ b/eos/effects/remoteshieldtransferentity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Drones named like: Shield Maintenance Bot (6 of 6)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("shieldBonus")
diff --git a/eos/effects/remoteshieldtransferfalloff.py b/eos/effects/remoteshieldtransferfalloff.py
index 1506da541c..4bdeee8ebb 100644
--- a/eos/effects/remoteshieldtransferfalloff.py
+++ b/eos/effects/remoteshieldtransferfalloff.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Remote Shield Booster (38 of 38)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("shieldBonus")
diff --git a/eos/effects/remotetargetpaintentity.py b/eos/effects/remotetargetpaintentity.py
index 4c001bd413..4ee7c9fc06 100644
--- a/eos/effects/remotetargetpaintentity.py
+++ b/eos/effects/remotetargetpaintentity.py
@@ -3,7 +3,9 @@
 # Used by:
 # Drones named like: TP (3 of 3)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties = True, remoteResists=True)
+                               stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotetargetpaintfalloff.py b/eos/effects/remotetargetpaintfalloff.py
index 2d1fcb5393..b9f5a6ef1d 100644
--- a/eos/effects/remotetargetpaintfalloff.py
+++ b/eos/effects/remotetargetpaintfalloff.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules from group: Target Painter (8 of 8)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties = True, remoteResists=True)
+                               stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotetrackingassistfalloff.py b/eos/effects/remotetrackingassistfalloff.py
index 6bd6ba72c5..411d4fc050 100644
--- a/eos/effects/remotetrackingassistfalloff.py
+++ b/eos/effects/remotetrackingassistfalloff.py
@@ -2,15 +2,17 @@
 #
 # Used by:
 # Modules from group: Remote Tracking Computer (8 of 8)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties = True)
+                                      stackingPenalties=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties = True)
+                                      stackingPenalties=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties = True)
+                                      stackingPenalties=True)
diff --git a/eos/effects/remotetrackingdisruptfalloff.py b/eos/effects/remotetrackingdisruptfalloff.py
index 9ea0a7f4e6..18fd3239e4 100644
--- a/eos/effects/remotetrackingdisruptfalloff.py
+++ b/eos/effects/remotetrackingdisruptfalloff.py
@@ -2,15 +2,17 @@
 #
 # Used by:
 # Variations of module: Tracking Disruptor I (6 of 6)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remoteweapondisruptentity.py b/eos/effects/remoteweapondisruptentity.py
index 3b997e1473..486f67f585 100644
--- a/eos/effects/remoteweapondisruptentity.py
+++ b/eos/effects/remoteweapondisruptentity.py
@@ -2,15 +2,17 @@
 #
 # Used by:
 # Drones named like: TD (3 of 3)
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotewebifierentity.py b/eos/effects/remotewebifierentity.py
index 36186be000..38028881ab 100644
--- a/eos/effects/remotewebifierentity.py
+++ b/eos/effects/remotewebifierentity.py
@@ -3,7 +3,9 @@
 # Used by:
 # Drones from group: Stasis Webifying Drone (3 of 3)
 type = "active", "projected"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/remotewebifierfalloff.py b/eos/effects/remotewebifierfalloff.py
index 1f37c29c5b..67f6d4dc5a 100644
--- a/eos/effects/remotewebifierfalloff.py
+++ b/eos/effects/remotewebifierfalloff.py
@@ -4,7 +4,9 @@
 # Modules from group: Stasis Grappler (7 of 7)
 # Modules from group: Stasis Web (18 of 18)
 type = "active", "projected"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/repairdronearmordamageamountbonus.py b/eos/effects/repairdronearmordamageamountbonus.py
index 8de0fd05e3..3d7d56d4b3 100644
--- a/eos/effects/repairdronearmordamageamountbonus.py
+++ b/eos/effects/repairdronearmordamageamountbonus.py
@@ -4,8 +4,10 @@
 # Modules named like: Drone Repair Augmentor (8 of 8)
 # Skill: Repair Drone Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
                                  "armorDamageAmount", container.getModifiedItemAttr("damageHP") * level,
-                                 stackingPenalties = True)
+                                 stackingPenalties=True)
diff --git a/eos/effects/repairdronehullbonusbonus.py b/eos/effects/repairdronehullbonusbonus.py
index 5aaf80d465..9e1ea724a5 100644
--- a/eos/effects/repairdronehullbonusbonus.py
+++ b/eos/effects/repairdronehullbonusbonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Drone Repair Augmentor (8 of 8)
 # Skill: Repair Drone Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
diff --git a/eos/effects/repairdroneshieldbonusbonus.py b/eos/effects/repairdroneshieldbonusbonus.py
index 39a0d2c307..86bcba79bc 100644
--- a/eos/effects/repairdroneshieldbonusbonus.py
+++ b/eos/effects/repairdroneshieldbonusbonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Drone Repair Augmentor (8 of 8)
 # Skill: Repair Drone Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
diff --git a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py
index d366f98e80..79a48defa7 100644
--- a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py
+++ b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py
@@ -6,6 +6,8 @@
 # Implant: Numon Family Heirloom
 # Skill: Repair Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/republicsetbonus3.py
index 5709959ae0..c4275fa9bc 100644
--- a/eos/effects/republicsetbonus3.py
+++ b/eos/effects/republicsetbonus3.py
@@ -4,6 +4,9 @@
 # Implants named like: High grade Jackal (6 of 6)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet"))
+                                             "scanLadarStrengthPercent",
+                                             implant.getModifiedItemAttr("implantSetRepublicFleet"))
diff --git a/eos/effects/republicsetlgbonus.py b/eos/effects/republicsetlgbonus.py
index bf79499ea6..c853ebed7d 100644
--- a/eos/effects/republicsetlgbonus.py
+++ b/eos/effects/republicsetlgbonus.py
@@ -4,6 +4,9 @@
 # Implants named like: Low grade Jackal (6 of 6)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "scanLadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGRepublicFleet"))
+                                             "scanLadarStrengthModifier",
+                                             implant.getModifiedItemAttr("implantSetLGRepublicFleet"))
diff --git a/eos/effects/resistancekillerhullall.py b/eos/effects/resistancekillerhullall.py
index 19f670dd71..cdf18fee66 100644
--- a/eos/effects/resistancekillerhullall.py
+++ b/eos/effects/resistancekillerhullall.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Polarized (12 of 18)
 type = "passive"
+
+
 def handler(fit, module, context):
     for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
         tgtAttr = '{}DamageResonance'.format(dmgType)
diff --git a/eos/effects/resistancekillershieldarmorall.py b/eos/effects/resistancekillershieldarmorall.py
index d513103feb..c89b4d3107 100644
--- a/eos/effects/resistancekillershieldarmorall.py
+++ b/eos/effects/resistancekillershieldarmorall.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Polarized (12 of 18)
 type = "passive"
+
+
 def handler(fit, module, context):
     for layer in ('armor', 'shield'):
         for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
diff --git a/eos/effects/rigdrawbackbonuseffect.py b/eos/effects/rigdrawbackbonuseffect.py
index 01d0a80181..58f066b1df 100644
--- a/eos/effects/rigdrawbackbonuseffect.py
+++ b/eos/effects/rigdrawbackbonuseffect.py
@@ -1,6 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
                                   "drawback", skill.getModifiedItemAttr("rigDrawbackBonus") * skill.level)
-    
\ No newline at end of file
diff --git a/eos/effects/rigdrawbackreductionarmor.py b/eos/effects/rigdrawbackreductionarmor.py
index 40276d6619..312e04d7a3 100644
--- a/eos/effects/rigdrawbackreductionarmor.py
+++ b/eos/effects/rigdrawbackreductionarmor.py
@@ -3,7 +3,11 @@
 # Used by:
 # Skill: Armor Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionastronautics.py b/eos/effects/rigdrawbackreductionastronautics.py
index 300b49e26c..679e381eb1 100644
--- a/eos/effects/rigdrawbackreductionastronautics.py
+++ b/eos/effects/rigdrawbackreductionastronautics.py
@@ -3,7 +3,11 @@
 # Used by:
 # Skill: Astronautics Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductiondrones.py b/eos/effects/rigdrawbackreductiondrones.py
index d1350efcc5..1761fae59f 100644
--- a/eos/effects/rigdrawbackreductiondrones.py
+++ b/eos/effects/rigdrawbackreductiondrones.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Drones Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionelectronic.py b/eos/effects/rigdrawbackreductionelectronic.py
index d1d7a3cd5c..7e27b8d0b4 100644
--- a/eos/effects/rigdrawbackreductionelectronic.py
+++ b/eos/effects/rigdrawbackreductionelectronic.py
@@ -3,8 +3,13 @@
 # Used by:
 # Skill: Electronic Superiority Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionenergyweapon.py b/eos/effects/rigdrawbackreductionenergyweapon.py
index d92ca3132c..9d99e3513d 100644
--- a/eos/effects/rigdrawbackreductionenergyweapon.py
+++ b/eos/effects/rigdrawbackreductionenergyweapon.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Energy Weapon Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionhybrid.py b/eos/effects/rigdrawbackreductionhybrid.py
index 005b00d08a..b7ffc09556 100644
--- a/eos/effects/rigdrawbackreductionhybrid.py
+++ b/eos/effects/rigdrawbackreductionhybrid.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Hybrid Weapon Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionlauncher.py b/eos/effects/rigdrawbackreductionlauncher.py
index 07bf0679c9..04276c9b98 100644
--- a/eos/effects/rigdrawbackreductionlauncher.py
+++ b/eos/effects/rigdrawbackreductionlauncher.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Launcher Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionprojectile.py b/eos/effects/rigdrawbackreductionprojectile.py
index 160436893f..c6c339041a 100644
--- a/eos/effects/rigdrawbackreductionprojectile.py
+++ b/eos/effects/rigdrawbackreductionprojectile.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Projectile Weapon Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rigdrawbackreductionshield.py b/eos/effects/rigdrawbackreductionshield.py
index a684ce50c8..fa2f75f886 100644
--- a/eos/effects/rigdrawbackreductionshield.py
+++ b/eos/effects/rigdrawbackreductionshield.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Shield Rigging
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback", src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback",
+                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/rolebonusbulkheadcpu.py b/eos/effects/rolebonusbulkheadcpu.py
index c6cbac5c51..51ed0d68b7 100644
--- a/eos/effects/rolebonusbulkheadcpu.py
+++ b/eos/effects/rolebonusbulkheadcpu.py
@@ -4,6 +4,8 @@
 # Ships from group: Freighter (4 of 5)
 # Ships from group: Jump Freighter (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Reinforced Bulkhead",
                                   "cpu", ship.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/rolebonuscdlinkspgreduction.py b/eos/effects/rolebonuscdlinkspgreduction.py
index 423f28aa2b..c28e6122ec 100644
--- a/eos/effects/rolebonuscdlinkspgreduction.py
+++ b/eos/effects/rolebonuscdlinkspgreduction.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Command Destroyer (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power", src.getModifiedItemAttr("roleBonusCD"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power",
+                                  src.getModifiedItemAttr("roleBonusCD"))
diff --git a/eos/effects/rolebonusecmcapcpu.py b/eos/effects/rolebonusecmcapcpu.py
index a9bd4e612b..3b8c775252 100644
--- a/eos/effects/rolebonusecmcapcpu.py
+++ b/eos/effects/rolebonusecmcapcpu.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Griffin Navy Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed", src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed",
+                                  src.getModifiedItemAttr("roleBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "cpu", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonusecmrange.py b/eos/effects/rolebonusecmrange.py
index 3d4c4c91e3..a981b4f948 100644
--- a/eos/effects/rolebonusecmrange.py
+++ b/eos/effects/rolebonusecmrange.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Griffin Navy Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloffEffectiveness", src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange", src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange",
+                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonusiceoreminingdurationcap.py b/eos/effects/rolebonusiceoreminingdurationcap.py
index 16222b0a3c..f2dfdf6129 100644
--- a/eos/effects/rolebonusiceoreminingdurationcap.py
+++ b/eos/effects/rolebonusiceoreminingdurationcap.py
@@ -3,8 +3,14 @@
 # Used by:
 # Variations of ship: Covetor (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "capacitorNeed", src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "duration", src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "capacitorNeed", src.getModifiedItemAttr("miningDurationRoleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "capacitorNeed",
+                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "duration",
+                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
+                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "capacitorNeed",
+                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
diff --git a/eos/effects/rolebonusjustscramblerstrength.py b/eos/effects/rolebonusjustscramblerstrength.py
index 588d7b3215..7be57333b6 100644
--- a/eos/effects/rolebonusjustscramblerstrength.py
+++ b/eos/effects/rolebonusjustscramblerstrength.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Maulus Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Navigation"),
-                                     "warpScrambleStrength", ship.getModifiedItemAttr("roleBonus"))
\ No newline at end of file
+                                     "warpScrambleStrength", ship.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
index 9af3bd8eb2..4f2dd193e6 100644
--- a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
+++ b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Marauder (4 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",
                                   "moduleReactivationDelay", ship.getModifiedItemAttr("roleBonusMarauder"))
diff --git a/eos/effects/rolebonusstasisrange.py b/eos/effects/rolebonusstasisrange.py
index 2afc333cef..c08aa135f8 100644
--- a/eos/effects/rolebonusstasisrange.py
+++ b/eos/effects/rolebonusstasisrange.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vigil Fleet Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
+                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonuswdcapcpu.py b/eos/effects/rolebonuswdcapcpu.py
index 1805cfd3de..c169850021 100644
--- a/eos/effects/rolebonuswdcapcpu.py
+++ b/eos/effects/rolebonuswdcapcpu.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Crucifier Navy Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu", src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "capacitorNeed", src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu",
+                                  src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "capacitorNeed",
+                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rolebonuswdrange.py b/eos/effects/rolebonuswdrange.py
index 6e653055ef..3d6cbdf242 100644
--- a/eos/effects/rolebonuswdrange.py
+++ b/eos/effects/rolebonuswdrange.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Crucifier Navy Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloff", src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRange", src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloff",
+                                  src.getModifiedItemAttr("roleBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRange",
+                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/rorqualcargoscanrangebonus.py b/eos/effects/rorqualcargoscanrangebonus.py
index 3fea94d3c3..1b10ac223b 100644
--- a/eos/effects/rorqualcargoscanrangebonus.py
+++ b/eos/effects/rorqualcargoscanrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cargo Scanner",
                                   "cargoScanRange", ship.getModifiedItemAttr("cargoScannerRangeBonus"))
diff --git a/eos/effects/rorqualsurveyscannerrangebonus.py b/eos/effects/rorqualsurveyscannerrangebonus.py
index d9857c037a..1a49d68ce4 100644
--- a/eos/effects/rorqualsurveyscannerrangebonus.py
+++ b/eos/effects/rorqualsurveyscannerrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",
                                   "surveyScanRange", ship.getModifiedItemAttr("surveyScannerRangeBonus"))
diff --git a/eos/effects/salvagermoduledurationreduction.py b/eos/effects/salvagermoduledurationreduction.py
index 8221ba404a..ecf0ee4cf5 100644
--- a/eos/effects/salvagermoduledurationreduction.py
+++ b/eos/effects/salvagermoduledurationreduction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Salvager",
                                   "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/salvaging.py b/eos/effects/salvaging.py
index d41213ceff..2caf9a3d46 100644
--- a/eos/effects/salvaging.py
+++ b/eos/effects/salvaging.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Salvager (2 of 2)
 type = "active"
+
+
 def handler(fit, module, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py
index 1d4c1539a6..f762ce8f08 100644
--- a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py
+++ b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py
@@ -4,6 +4,9 @@
 # Modules from group: Rig Resource Processing (8 of 10)
 # Implant: Poteque 'Prospector' Salvaging SV-905
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "accessDifficultyBonus", container.getModifiedItemAttr("accessDifficultyBonus"), position="post")
+                                     "accessDifficultyBonus", container.getModifiedItemAttr("accessDifficultyBonus"),
+                                     position="post")
diff --git a/eos/effects/scangravimetricstrengthmodifiereffect.py b/eos/effects/scangravimetricstrengthmodifiereffect.py
index ae4e2bc5da..64388c877f 100644
--- a/eos/effects/scangravimetricstrengthmodifiereffect.py
+++ b/eos/effects/scangravimetricstrengthmodifiereffect.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants named like: Low grade Talon (5 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanGravimetricStrength", implant.getModifiedItemAttr("scanGravimetricStrengthModifier"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("scanGravimetricStrength", implant.getModifiedItemAttr("scanGravimetricStrengthModifier"))
diff --git a/eos/effects/scanladarstrengthmodifiereffect.py b/eos/effects/scanladarstrengthmodifiereffect.py
index 984c6ef357..43c9aeafd7 100644
--- a/eos/effects/scanladarstrengthmodifiereffect.py
+++ b/eos/effects/scanladarstrengthmodifiereffect.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants named like: Low grade Jackal (5 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanLadarStrength", implant.getModifiedItemAttr("scanLadarStrengthModifier"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("scanLadarStrength", implant.getModifiedItemAttr("scanLadarStrengthModifier"))
diff --git a/eos/effects/scanmagnetometricstrengthmodifiereffect.py b/eos/effects/scanmagnetometricstrengthmodifiereffect.py
index aa9efba781..a4c66463f6 100644
--- a/eos/effects/scanmagnetometricstrengthmodifiereffect.py
+++ b/eos/effects/scanmagnetometricstrengthmodifiereffect.py
@@ -3,5 +3,8 @@
 # Used by:
 # Implants named like: Low grade Spur (5 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanMagnetometricStrength", implant.getModifiedItemAttr("scanMagnetometricStrengthModifier"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("scanMagnetometricStrength",
+                              implant.getModifiedItemAttr("scanMagnetometricStrengthModifier"))
diff --git a/eos/effects/scanradarstrengthmodifiereffect.py b/eos/effects/scanradarstrengthmodifiereffect.py
index 2c6f049df2..94069c92f3 100644
--- a/eos/effects/scanradarstrengthmodifiereffect.py
+++ b/eos/effects/scanradarstrengthmodifiereffect.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants named like: Low grade Grail (5 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanRadarStrength", implant.getModifiedItemAttr("scanRadarStrengthModifier"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("scanRadarStrength", implant.getModifiedItemAttr("scanRadarStrengthModifier"))
diff --git a/eos/effects/scanresolutionaddpassive.py b/eos/effects/scanresolutionaddpassive.py
index 78a8e292ef..161b8c57cf 100644
--- a/eos/effects/scanresolutionaddpassive.py
+++ b/eos/effects/scanresolutionaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Electronic Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("scanResolution", module.getModifiedItemAttr("scanResolution"))
diff --git a/eos/effects/scanresolutionmultiplieronline.py b/eos/effects/scanresolutionmultiplieronline.py
index fb4af457d8..9b453a4c81 100644
--- a/eos/effects/scanresolutionmultiplieronline.py
+++ b/eos/effects/scanresolutionmultiplieronline.py
@@ -4,6 +4,8 @@
 # Modules from group: Warp Core Stabilizer (8 of 8)
 # Module: Target Spectrum Breaker
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties = True)
\ No newline at end of file
+                              stackingPenalties=True)
diff --git a/eos/effects/scanstrengthaddpassive.py b/eos/effects/scanstrengthaddpassive.py
index 0509542655..bf7d16f602 100644
--- a/eos/effects/scanstrengthaddpassive.py
+++ b/eos/effects/scanstrengthaddpassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Subsystems from group: Electronic Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for sensorType in sensorTypes:
diff --git a/eos/effects/scanstrengthbonuspercentactivate.py b/eos/effects/scanstrengthbonuspercentactivate.py
index 50b7b50ba3..2ce6a627ab 100644
--- a/eos/effects/scanstrengthbonuspercentactivate.py
+++ b/eos/effects/scanstrengthbonuspercentactivate.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: QA ECCM
 type = "active"
+
+
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         fit.ship.boostItemAttr(
diff --git a/eos/effects/scanstrengthbonuspercentonline.py b/eos/effects/scanstrengthbonuspercentonline.py
index 0dc5400fab..bccd06a4a3 100644
--- a/eos/effects/scanstrengthbonuspercentonline.py
+++ b/eos/effects/scanstrengthbonuspercentonline.py
@@ -3,8 +3,10 @@
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         fit.ship.boostItemAttr("scan%sStrength" % type,
                                module.getModifiedItemAttr("scan%sStrengthPercent" % type),
-                               stackingPenalties = True)
\ No newline at end of file
+                               stackingPenalties=True)
diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/scanstrengthbonuspercentpassive.py
index 365a0f7a93..7e0f43c1d8 100644
--- a/eos/effects/scanstrengthbonuspercentpassive.py
+++ b/eos/effects/scanstrengthbonuspercentpassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: High grade (20 of 61)
 type = "passive"
+
+
 def handler(fit, implant, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         sensorType = "scan{0}Strength".format(type)
diff --git a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
index fb750cd179..ba150045c8 100644
--- a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
+++ b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py
@@ -4,6 +4,8 @@
 # Modules named like: Drone Control Range Augmentor (8 of 8)
 # Skills named like: Drone Avionics (2 of 2)
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     amount = container.getModifiedItemAttr("droneRangeBonus") * level
diff --git a/eos/effects/scriptdurationbonus.py b/eos/effects/scriptdurationbonus.py
index cd337615b1..5b30815295 100644
--- a/eos/effects/scriptdurationbonus.py
+++ b/eos/effects/scriptdurationbonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Charge: Focused Warp Disruption Script
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("duration", module.getModifiedChargeAttr("durationBonus"))
diff --git a/eos/effects/scriptmassbonuspercentagebonus.py b/eos/effects/scriptmassbonuspercentagebonus.py
index d045e09e1d..e6d42eee45 100644
--- a/eos/effects/scriptmassbonuspercentagebonus.py
+++ b/eos/effects/scriptmassbonuspercentagebonus.py
@@ -4,5 +4,7 @@
 # Charge: Focused Warp Disruption Script
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("massBonusPercentage", module.getModifiedChargeAttr("massBonusPercentageBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py b/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
index e8b09cedbd..12be7588b5 100644
--- a/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputeraoecloudsizebonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Tracking Script (2 of 2)
 # Charges named like: Missile Script (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("aoeCloudSizeBonus", module.getModifiedChargeAttr("aoeCloudSizeBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py b/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
index 514cc00772..800c91a083 100644
--- a/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputeraoevelocitybonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Tracking Script (2 of 2)
 # Charges named like: Missile Script (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("aoeVelocityBonus", module.getModifiedChargeAttr("aoeVelocityBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py b/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
index 5f58e16866..5f6b2e00b1 100644
--- a/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputerexplosiondelaybonusbonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Charges named like: Missile Script (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("explosionDelayBonus", module.getModifiedChargeAttr("explosionDelayBonusBonus"))
diff --git a/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py b/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
index 31859dbc9b..9867c0a843 100644
--- a/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
+++ b/eos/effects/scriptmissileguidancecomputermissilevelocitybonusbonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Charges named like: Missile Script (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("missileVelocityBonus", module.getModifiedChargeAttr("missileVelocityBonusBonus"))
diff --git a/eos/effects/scriptresistancebonusbonus.py b/eos/effects/scriptresistancebonusbonus.py
index 1698579fc6..d2c313dca0 100644
--- a/eos/effects/scriptresistancebonusbonus.py
+++ b/eos/effects/scriptresistancebonusbonus.py
@@ -3,8 +3,11 @@
 # Used by:
 # Charges named like: Resistance Script (8 of 8)
 type = "passive"
+
+
 def handler(fit, src, context):
     src.boostItemAttr("emDamageResistanceBonus", src.getModifiedChargeAttr("emDamageResistanceBonusBonus"))
-    src.boostItemAttr("explosiveDamageResistanceBonus", src.getModifiedChargeAttr("explosiveDamageResistanceBonusBonus"))
+    src.boostItemAttr("explosiveDamageResistanceBonus",
+                      src.getModifiedChargeAttr("explosiveDamageResistanceBonusBonus"))
     src.boostItemAttr("kineticDamageResistanceBonus", src.getModifiedChargeAttr("kineticDamageResistanceBonusBonus"))
     src.boostItemAttr("thermalDamageResistanceBonus", src.getModifiedChargeAttr("thermalDamageResistanceBonusBonus"))
diff --git a/eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py b/eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py
index 1eb7b7b6b7..a74e9d0bc2 100644
--- a/eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py
+++ b/eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Sensor Booster Script (3 of 3)
 # Charges from group: Sensor Dampener Script (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedChargeAttr("maxTargetRangeBonusBonus"))
\ No newline at end of file
+    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedChargeAttr("maxTargetRangeBonusBonus"))
diff --git a/eos/effects/scriptsensorboosterscanresolutionbonusbonus.py b/eos/effects/scriptsensorboosterscanresolutionbonusbonus.py
index 2372aa0550..c1d064018c 100644
--- a/eos/effects/scriptsensorboosterscanresolutionbonusbonus.py
+++ b/eos/effects/scriptsensorboosterscanresolutionbonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Sensor Booster Script (3 of 3)
 # Charges from group: Sensor Dampener Script (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
-    module.boostItemAttr("scanResolutionBonus", module.getModifiedChargeAttr("scanResolutionBonusBonus"))
\ No newline at end of file
+    module.boostItemAttr("scanResolutionBonus", module.getModifiedChargeAttr("scanResolutionBonusBonus"))
diff --git a/eos/effects/scriptsensorboostersensorstrengthbonusbonus.py b/eos/effects/scriptsensorboostersensorstrengthbonusbonus.py
index f0f6500a68..467c7edef0 100644
--- a/eos/effects/scriptsensorboostersensorstrengthbonusbonus.py
+++ b/eos/effects/scriptsensorboostersensorstrengthbonusbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Charges from group: Sensor Booster Script (3 of 3)
 type = "active"
+
+
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-            module.boostItemAttr("scan{}StrengthPercent".format(scanType), module.getModifiedChargeAttr("sensorStrengthBonusBonus"))
+        module.boostItemAttr("scan{}StrengthPercent".format(scanType),
+                             module.getModifiedChargeAttr("sensorStrengthBonusBonus"))
diff --git a/eos/effects/scriptsignatureradiusbonusbonus.py b/eos/effects/scriptsignatureradiusbonusbonus.py
index 403de39f06..29b60408aa 100644
--- a/eos/effects/scriptsignatureradiusbonusbonus.py
+++ b/eos/effects/scriptsignatureradiusbonusbonus.py
@@ -4,5 +4,7 @@
 # Charge: Focused Warp Disruption Script
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("signatureRadiusBonus", module.getModifiedChargeAttr("signatureRadiusBonusBonus"))
diff --git a/eos/effects/scriptspeedboostfactorbonusbonus.py b/eos/effects/scriptspeedboostfactorbonusbonus.py
index 613ab01e3e..e7795bc1ae 100644
--- a/eos/effects/scriptspeedboostfactorbonusbonus.py
+++ b/eos/effects/scriptspeedboostfactorbonusbonus.py
@@ -4,5 +4,7 @@
 # Charge: Focused Warp Disruption Script
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("speedBoostFactorBonus", module.getModifiedChargeAttr("speedBoostFactorBonusBonus"))
diff --git a/eos/effects/scriptspeedfactorbonusbonus.py b/eos/effects/scriptspeedfactorbonusbonus.py
index 34b7121c0e..3df3515007 100644
--- a/eos/effects/scriptspeedfactorbonusbonus.py
+++ b/eos/effects/scriptspeedfactorbonusbonus.py
@@ -4,5 +4,7 @@
 # Charge: Focused Warp Disruption Script
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("speedFactorBonus", module.getModifiedChargeAttr("speedFactorBonusBonus"))
diff --git a/eos/effects/scripttrackingcomputerfalloffbonusbonus.py b/eos/effects/scripttrackingcomputerfalloffbonusbonus.py
index 987bbea919..b2c054606f 100644
--- a/eos/effects/scripttrackingcomputerfalloffbonusbonus.py
+++ b/eos/effects/scripttrackingcomputerfalloffbonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Tracking Disruption Script (2 of 2)
 # Charges from group: Tracking Script (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("falloffBonus", module.getModifiedChargeAttr("falloffBonusBonus"))
diff --git a/eos/effects/scripttrackingcomputermaxrangebonusbonus.py b/eos/effects/scripttrackingcomputermaxrangebonusbonus.py
index 04194a9328..c3b510a7b5 100644
--- a/eos/effects/scripttrackingcomputermaxrangebonusbonus.py
+++ b/eos/effects/scripttrackingcomputermaxrangebonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Tracking Disruption Script (2 of 2)
 # Charges from group: Tracking Script (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("maxRangeBonus", module.getModifiedChargeAttr("maxRangeBonusBonus"))
diff --git a/eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py b/eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py
index 027f78b110..ff256a748d 100644
--- a/eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py
+++ b/eos/effects/scripttrackingcomputertrackingspeedbonusbonus.py
@@ -4,5 +4,7 @@
 # Charges from group: Tracking Disruption Script (2 of 2)
 # Charges from group: Tracking Script (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("trackingSpeedBonus", module.getModifiedChargeAttr("trackingSpeedBonusBonus"))
diff --git a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py b/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
index 5e9ae6df95..4e9f29bd9b 100644
--- a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
+++ b/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
@@ -3,5 +3,7 @@
 # Used by:
 # Charge: Focused Warp Disruption Script
 type = "passive"
+
+
 def handler(fit, module, context):
     module.forceItemAttr("disallowInEmpireSpace", module.getModifiedChargeAttr("disallowInEmpireSpace"))
diff --git a/eos/effects/scriptwarpscramblerangebonus.py b/eos/effects/scriptwarpscramblerangebonus.py
index 82a3ce954b..adbcbc88ea 100644
--- a/eos/effects/scriptwarpscramblerangebonus.py
+++ b/eos/effects/scriptwarpscramblerangebonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Charge: Focused Warp Disruption Script
 type = "passive"
+
+
 def handler(fit, module, context):
     module.boostItemAttr("warpScrambleRange", module.getModifiedChargeAttr("warpScrambleRangeBonus"))
diff --git a/eos/effects/selfrof.py b/eos/effects/selfrof.py
index 58334e09de..b9f0541f27 100644
--- a/eos/effects/selfrof.py
+++ b/eos/effects/selfrof.py
@@ -5,6 +5,8 @@
 # Skill: Rocket Specialization
 # Skill: Torpedo Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
\ No newline at end of file
+                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/selft2largehybridblasterdamagebonus.py b/eos/effects/selft2largehybridblasterdamagebonus.py
index 559825e923..9295095409 100644
--- a/eos/effects/selft2largehybridblasterdamagebonus.py
+++ b/eos/effects/selft2largehybridblasterdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Blaster Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2largehybridraildamagebonus.py b/eos/effects/selft2largehybridraildamagebonus.py
index 177517e719..6742d22d85 100644
--- a/eos/effects/selft2largehybridraildamagebonus.py
+++ b/eos/effects/selft2largehybridraildamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Railgun Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2largelaserbeamdamagebonus.py b/eos/effects/selft2largelaserbeamdamagebonus.py
index 4a23b07a9e..0a4cbafde9 100644
--- a/eos/effects/selft2largelaserbeamdamagebonus.py
+++ b/eos/effects/selft2largelaserbeamdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Beam Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2largelaserpulsedamagebonus.py b/eos/effects/selft2largelaserpulsedamagebonus.py
index 1e0e7a507a..4714dd9135 100644
--- a/eos/effects/selft2largelaserpulsedamagebonus.py
+++ b/eos/effects/selft2largelaserpulsedamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Pulse Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2largeprojectileacdamagebonus.py b/eos/effects/selft2largeprojectileacdamagebonus.py
index e0af7c0458..0b3e4c6e3b 100644
--- a/eos/effects/selft2largeprojectileacdamagebonus.py
+++ b/eos/effects/selft2largeprojectileacdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Autocannon Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2largeprojectileartydamagebonus.py b/eos/effects/selft2largeprojectileartydamagebonus.py
index ae4744e49a..245a64866f 100644
--- a/eos/effects/selft2largeprojectileartydamagebonus.py
+++ b/eos/effects/selft2largeprojectileartydamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Large Artillery Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumhybridblasterdamagebonus.py b/eos/effects/selft2mediumhybridblasterdamagebonus.py
index 856c453284..ca7dffdf5b 100644
--- a/eos/effects/selft2mediumhybridblasterdamagebonus.py
+++ b/eos/effects/selft2mediumhybridblasterdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Blaster Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumhybridraildamagebonus.py b/eos/effects/selft2mediumhybridraildamagebonus.py
index 1636d73587..77b6c5abb9 100644
--- a/eos/effects/selft2mediumhybridraildamagebonus.py
+++ b/eos/effects/selft2mediumhybridraildamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Railgun Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumlaserbeamdamagebonus.py b/eos/effects/selft2mediumlaserbeamdamagebonus.py
index 4c7296f7db..e509d73de1 100644
--- a/eos/effects/selft2mediumlaserbeamdamagebonus.py
+++ b/eos/effects/selft2mediumlaserbeamdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Beam Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumlaserpulsedamagebonus.py b/eos/effects/selft2mediumlaserpulsedamagebonus.py
index fde671bfea..0214939795 100644
--- a/eos/effects/selft2mediumlaserpulsedamagebonus.py
+++ b/eos/effects/selft2mediumlaserpulsedamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Pulse Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumprojectileacdamagebonus.py b/eos/effects/selft2mediumprojectileacdamagebonus.py
index c8feae6d9e..a18d3914a1 100644
--- a/eos/effects/selft2mediumprojectileacdamagebonus.py
+++ b/eos/effects/selft2mediumprojectileacdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Autocannon Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2mediumprojectileartydamagebonus.py b/eos/effects/selft2mediumprojectileartydamagebonus.py
index d0fc889bc4..8b091e5d8a 100644
--- a/eos/effects/selft2mediumprojectileartydamagebonus.py
+++ b/eos/effects/selft2mediumprojectileartydamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Medium Artillery Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smallhybridblasterdamagebonus.py b/eos/effects/selft2smallhybridblasterdamagebonus.py
index d1903a1129..3bc3b79c14 100644
--- a/eos/effects/selft2smallhybridblasterdamagebonus.py
+++ b/eos/effects/selft2smallhybridblasterdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Blaster Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smallhybridraildamagebonus.py b/eos/effects/selft2smallhybridraildamagebonus.py
index cd427589bd..8da445f83a 100644
--- a/eos/effects/selft2smallhybridraildamagebonus.py
+++ b/eos/effects/selft2smallhybridraildamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Railgun Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smalllaserbeamdamagebonus.py b/eos/effects/selft2smalllaserbeamdamagebonus.py
index b3982e22e5..b6cd4b2fd4 100644
--- a/eos/effects/selft2smalllaserbeamdamagebonus.py
+++ b/eos/effects/selft2smalllaserbeamdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Beam Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smalllaserpulsedamagebonus.py b/eos/effects/selft2smalllaserpulsedamagebonus.py
index 78d48b5ece..92a516038f 100644
--- a/eos/effects/selft2smalllaserpulsedamagebonus.py
+++ b/eos/effects/selft2smalllaserpulsedamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Pulse Laser Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smallprojectileacdamagebonus.py b/eos/effects/selft2smallprojectileacdamagebonus.py
index 46d43f3046..d86b1ed904 100644
--- a/eos/effects/selft2smallprojectileacdamagebonus.py
+++ b/eos/effects/selft2smallprojectileacdamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Autocannon Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/selft2smallprojectileartydamagebonus.py b/eos/effects/selft2smallprojectileartydamagebonus.py
index faec6a137c..52510d1cbf 100644
--- a/eos/effects/selft2smallprojectileartydamagebonus.py
+++ b/eos/effects/selft2smallprojectileartydamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Small Artillery Specialization
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
\ No newline at end of file
+                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/sensorboosteractivepercentage.py b/eos/effects/sensorboosteractivepercentage.py
index c6e61424f1..f79c16a572 100644
--- a/eos/effects/sensorboosteractivepercentage.py
+++ b/eos/effects/sensorboosteractivepercentage.py
@@ -3,11 +3,13 @@
 # Used by:
 # Modules from group: Sensor Booster (16 of 16)
 type = "active"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
 
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         fit.ship.boostItemAttr(
diff --git a/eos/effects/sensorboosttargetedhostile.py b/eos/effects/sensorboosttargetedhostile.py
index 53712211a9..0055c9c925 100644
--- a/eos/effects/sensorboosttargetedhostile.py
+++ b/eos/effects/sensorboosttargetedhostile.py
@@ -3,9 +3,11 @@
 # Used by:
 # Drones named like: SD (3 of 3)
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.ship.multiplyItemAttr("maxTargetRange", container.getModifiedItemAttr("maxTargetRangeMultiplier"),
-                                  stackingPenalties = True, penaltyGroup="postMul")
+                                  stackingPenalties=True, penaltyGroup="postMul")
         fit.ship.multiplyItemAttr("scanResolution", container.getModifiedItemAttr("scanResolutionMultiplier"),
-                                  stackingPenalties = True, penaltyGroup="postMul")
+                                  stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py b/eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py
index cb504e7bbb..244f84e2af 100644
--- a/eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py
+++ b/eos/effects/sensorcompensationsensorstrengthbonusgravimetric.py
@@ -3,5 +3,8 @@
 # Used by:
 # Skill: Gravimetric Sensor Compensation
 type = "passive"
+
+
 def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
+    fit.ship.boostItemAttr("scanGravimetricStrength",
+                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusladar.py b/eos/effects/sensorcompensationsensorstrengthbonusladar.py
index 25c5ac30c1..b046ce046b 100644
--- a/eos/effects/sensorcompensationsensorstrengthbonusladar.py
+++ b/eos/effects/sensorcompensationsensorstrengthbonusladar.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Ladar Sensor Compensation
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.ship.boostItemAttr("scanLadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py b/eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py
index 80e58a9fa3..6306a2df68 100644
--- a/eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py
+++ b/eos/effects/sensorcompensationsensorstrengthbonusmagnetometric.py
@@ -3,5 +3,8 @@
 # Used by:
 # Skill: Magnetometric Sensor Compensation
 type = "passive"
+
+
 def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
+    fit.ship.boostItemAttr("scanMagnetometricStrength",
+                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/sensorcompensationsensorstrengthbonusradar.py b/eos/effects/sensorcompensationsensorstrengthbonusradar.py
index 0a88f39619..2df326dca7 100644
--- a/eos/effects/sensorcompensationsensorstrengthbonusradar.py
+++ b/eos/effects/sensorcompensationsensorstrengthbonusradar.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Radar Sensor Compensation
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.ship.boostItemAttr("scanRadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py b/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py
index 9e55388e27..f4d9c08860 100644
--- a/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py
+++ b/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py
@@ -5,6 +5,8 @@
 # Modules named like: Liquid Cooled Electronics (8 of 8)
 # Skill: Electronics Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronics Upgrades"),
diff --git a/eos/effects/sentrydronedamagebonus.py b/eos/effects/sentrydronedamagebonus.py
index 07a42592b5..cf8ec25b20 100644
--- a/eos/effects/sentrydronedamagebonus.py
+++ b/eos/effects/sentrydronedamagebonus.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Sentry Damage Augmentor (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"),
-                                 stackingPenalties = True)
\ No newline at end of file
+                                 stackingPenalties=True)
diff --git a/eos/effects/setbonusasklepian.py b/eos/effects/setbonusasklepian.py
index 1451bee7d5..5d063f4708 100644
--- a/eos/effects/setbonusasklepian.py
+++ b/eos/effects/setbonusasklepian.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Asklepian Omega (2 of 2)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Cybernetics"),
                                              "armorRepairBonus", src.getModifiedItemAttr("implantSetSerpentis2"))
diff --git a/eos/effects/setbonusbloodraider.py b/eos/effects/setbonusbloodraider.py
index 73fb305ec0..2b318f6f95 100644
--- a/eos/effects/setbonusbloodraider.py
+++ b/eos/effects/setbonusbloodraider.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Talisman (18 of 18)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider"))
+                                             "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider"))
diff --git a/eos/effects/setbonusbloodraidernosferatu.py b/eos/effects/setbonusbloodraidernosferatu.py
index 31d3d4b3b1..81d37c5981 100644
--- a/eos/effects/setbonusbloodraidernosferatu.py
+++ b/eos/effects/setbonusbloodraidernosferatu.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Talisman (15 of 18)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
                                   "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/setbonuschristmasagilitybonus.py
index 760c76e05d..d8f472b503 100644
--- a/eos/effects/setbonuschristmasagilitybonus.py
+++ b/eos/effects/setbonuschristmasagilitybonus.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/setbonuschristmasarmorhpbonus2.py
index 6d096e01a9..b9eb115576 100644
--- a/eos/effects/setbonuschristmasarmorhpbonus2.py
+++ b/eos/effects/setbonuschristmasarmorhpbonus2.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/setbonuschristmasbonusvelocity.py
index 09352ce101..eb2ae35bc4 100644
--- a/eos/effects/setbonuschristmasbonusvelocity.py
+++ b/eos/effects/setbonuschristmasbonusvelocity.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/setbonuschristmascapacitorcapacity.py
index 79cc5654af..cb2a90ce15 100644
--- a/eos/effects/setbonuschristmascapacitorcapacity.py
+++ b/eos/effects/setbonuschristmascapacitorcapacity.py
@@ -4,6 +4,9 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "capacitorCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "capacitorCapacityBonus",
+                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/setbonuschristmascapacitorrecharge2.py
index a6c85f4def..39e0d41b42 100644
--- a/eos/effects/setbonuschristmascapacitorrecharge2.py
+++ b/eos/effects/setbonuschristmascapacitorrecharge2.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/setbonuschristmascpuoutput.py
index 5544850700..2c7d069906 100644
--- a/eos/effects/setbonuschristmascpuoutput.py
+++ b/eos/effects/setbonuschristmascpuoutput.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/setbonuschristmaspowergrid.py
index 936f394dc8..1833563914 100644
--- a/eos/effects/setbonuschristmaspowergrid.py
+++ b/eos/effects/setbonuschristmaspowergrid.py
@@ -4,6 +4,9 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "powerEngineeringOutputBonus", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "powerEngineeringOutputBonus",
+                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/setbonuschristmasshieldcapacitybonus.py
index 8de48f2ab4..e9212fe688 100644
--- a/eos/effects/setbonuschristmasshieldcapacitybonus.py
+++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py
@@ -4,6 +4,8 @@
 # Implants named like: Genolution Core Augmentation CA (4 of 4)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                      "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
+                                             "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/setbonusguristas.py b/eos/effects/setbonusguristas.py
index 34bbfacc26..18a708dc1c 100644
--- a/eos/effects/setbonusguristas.py
+++ b/eos/effects/setbonusguristas.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Crystal (18 of 18)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
+                                             "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
diff --git a/eos/effects/setbonusmordus.py b/eos/effects/setbonusmordus.py
index eef3675f98..6db3789dd6 100644
--- a/eos/effects/setbonusmordus.py
+++ b/eos/effects/setbonusmordus.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Centurion (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
+                                             "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
diff --git a/eos/effects/setbonusore.py b/eos/effects/setbonusore.py
index a7342a8fa2..0d5a832337 100644
--- a/eos/effects/setbonusore.py
+++ b/eos/effects/setbonusore.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Harvest (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
+                                             "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
diff --git a/eos/effects/setbonussansha.py b/eos/effects/setbonussansha.py
index df7ae7be3e..48c915f1dc 100644
--- a/eos/effects/setbonussansha.py
+++ b/eos/effects/setbonussansha.py
@@ -5,6 +5,8 @@
 # Implant: High-grade Halo Omega
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                      "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1)
+                                             "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1)
diff --git a/eos/effects/setbonusserpentis.py b/eos/effects/setbonusserpentis.py
index f4de04dcc2..96f1048f57 100644
--- a/eos/effects/setbonusserpentis.py
+++ b/eos/effects/setbonusserpentis.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Snake (18 of 18)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
+                                             "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
diff --git a/eos/effects/setbonussisters.py b/eos/effects/setbonussisters.py
index a43478d52d..a630797411 100644
--- a/eos/effects/setbonussisters.py
+++ b/eos/effects/setbonussisters.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Virtue (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
+                                             "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
diff --git a/eos/effects/setbonussyndicate.py b/eos/effects/setbonussyndicate.py
index 61fc59591e..ffb9c754fb 100644
--- a/eos/effects/setbonussyndicate.py
+++ b/eos/effects/setbonussyndicate.py
@@ -4,6 +4,9 @@
 # Implants named like: grade Edge (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "boosterAttributeModifier", implant.getModifiedItemAttr("implantSetSyndicate"))
+                                             "boosterAttributeModifier",
+                                             implant.getModifiedItemAttr("implantSetSyndicate"))
diff --git a/eos/effects/setbonusthukker.py b/eos/effects/setbonusthukker.py
index 8594ddcfec..78313ac625 100644
--- a/eos/effects/setbonusthukker.py
+++ b/eos/effects/setbonusthukker.py
@@ -4,6 +4,8 @@
 # Implants named like: grade Nomad (12 of 12)
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                      "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))
+                                             "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))
diff --git a/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py b/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py
index a0e5b18e98..7b53ea9667 100644
--- a/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py
@@ -5,6 +5,8 @@
 # Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6)
 # Skill: Sharpshooter
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/shieldboostamplifier.py b/eos/effects/shieldboostamplifier.py
index 7b9ca00dfa..6b37ba1570 100644
--- a/eos/effects/shieldboostamplifier.py
+++ b/eos/effects/shieldboostamplifier.py
@@ -4,7 +4,10 @@
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Shield Boost Amplifier (25 of 25)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-                                  stackingPenalties=True)
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
+        "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
+        stackingPenalties=True)
diff --git a/eos/effects/shieldboostamplifierpassive.py b/eos/effects/shieldboostamplifierpassive.py
index 33b0cff400..182c04acf6 100644
--- a/eos/effects/shieldboostamplifierpassive.py
+++ b/eos/effects/shieldboostamplifierpassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Crystal (15 of 18)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/shieldboostamplifierpassivebooster.py
index b0b98b09cb..0c71581944 100644
--- a/eos/effects/shieldboostamplifierpassivebooster.py
+++ b/eos/effects/shieldboostamplifierpassivebooster.py
@@ -4,6 +4,9 @@
 # Implants named like: Blue Pill Booster (5 of 5)
 # Implant: Antipharmakon Thureo
 type = "passive"
+
+
 def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
+        "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/shieldboosterdurationbonusshieldskills.py b/eos/effects/shieldboosterdurationbonusshieldskills.py
index 7664e8f810..4840594c16 100644
--- a/eos/effects/shieldboosterdurationbonusshieldskills.py
+++ b/eos/effects/shieldboosterdurationbonusshieldskills.py
@@ -3,6 +3,9 @@
 # Used by:
 # Modules named like: Core Defense Operational Solidifier (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-                                  "duration", module.getModifiedItemAttr("durationSkillBonus"))
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
+        "duration", module.getModifiedItemAttr("durationSkillBonus"))
diff --git a/eos/effects/shieldboosting.py b/eos/effects/shieldboosting.py
index 70e49fa8b3..8d8676d0ed 100644
--- a/eos/effects/shieldboosting.py
+++ b/eos/effects/shieldboosting.py
@@ -4,7 +4,9 @@
 # Modules from group: Shield Booster (93 of 93)
 runTime = "late"
 type = "active"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("shieldBonus")
     speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
\ No newline at end of file
+    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/shieldcapacityaddpassive.py b/eos/effects/shieldcapacityaddpassive.py
index 6bc0000b0d..cf0ff741bc 100644
--- a/eos/effects/shieldcapacityaddpassive.py
+++ b/eos/effects/shieldcapacityaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacity"))
diff --git a/eos/effects/shieldcapacitybonusonline.py b/eos/effects/shieldcapacitybonusonline.py
index 8f3d4afbb0..7c4cb037d1 100644
--- a/eos/effects/shieldcapacitybonusonline.py
+++ b/eos/effects/shieldcapacitybonusonline.py
@@ -4,5 +4,7 @@
 # Modules from group: Shield Extender (33 of 33)
 # Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))
diff --git a/eos/effects/shieldcapacitymultiply.py b/eos/effects/shieldcapacitymultiply.py
index ea6bfa8c66..71c91f19e9 100644
--- a/eos/effects/shieldcapacitymultiply.py
+++ b/eos/effects/shieldcapacitymultiply.py
@@ -6,5 +6,7 @@
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules named like: Flux Coil (12 of 12)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacityMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacityMultiplier"))
diff --git a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
index 5d38c76e32..97658eb273 100644
--- a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
+++ b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py
@@ -5,6 +5,8 @@
 type = "gang"
 gangBoost = "shieldCapacity"
 gangBonus = "shieldCapacityBonus"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level)
diff --git a/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py b/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py
index 29d79db87e..6161d3fe09 100644
--- a/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py
+++ b/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gnome' Shield Emission Systems SE (6 of 6)
 # Skill: Shield Emission Systems
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
diff --git a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
index b3ff25128e..9e2f091fe7 100644
--- a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
+++ b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
@@ -8,6 +8,8 @@
 # Implant: Sansha Modified 'Gnome' Implant
 # Skill: Shield Management
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("shieldCapacity", container.getModifiedItemAttr("shieldCapacityBonus") * level)
diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
index c5f89daf0a..266c3776de 100644
--- a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
+++ b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Shield Power Relay (6 of 6)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("rechargeratebonus") or 0)
diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py b/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py
index 8ec779a672..919fc8b79c 100644
--- a/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py
+++ b/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py
@@ -6,6 +6,8 @@
 # Implant: Sansha Modified 'Gnome' Implant
 # Skill: Shield Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("shieldRechargeRate", container.getModifiedItemAttr("rechargeratebonus") * level)
diff --git a/eos/effects/shieldoperationskillboostcapacitorneedbonus.py b/eos/effects/shieldoperationskillboostcapacitorneedbonus.py
index aa8e6c21d9..da4472bd42 100644
--- a/eos/effects/shieldoperationskillboostcapacitorneedbonus.py
+++ b/eos/effects/shieldoperationskillboostcapacitorneedbonus.py
@@ -4,6 +4,8 @@
 # Modules named like: Core Defense Capacitor Safeguard (8 of 8)
 # Skill: Shield Compensation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
diff --git a/eos/effects/shieldrechargerateaddpassive.py b/eos/effects/shieldrechargerateaddpassive.py
index 4b16bcfd4b..95e2db768e 100644
--- a/eos/effects/shieldrechargerateaddpassive.py
+++ b/eos/effects/shieldrechargerateaddpassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRate") or 0)
diff --git a/eos/effects/shieldtransfer.py b/eos/effects/shieldtransfer.py
index a06ea9e4cd..b55165a325 100644
--- a/eos/effects/shieldtransfer.py
+++ b/eos/effects/shieldtransfer.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: QA Shield Transporter - 5 Players
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("shieldBonus")
diff --git a/eos/effects/shieldtransportcpuneedbonuseffect.py b/eos/effects/shieldtransportcpuneedbonuseffect.py
index 0e5cf26bf7..311bdf3ad9 100644
--- a/eos/effects/shieldtransportcpuneedbonuseffect.py
+++ b/eos/effects/shieldtransportcpuneedbonuseffect.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Logistics (3 of 5)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "cpu", src.getModifiedItemAttr("shieldTransportCpuNeedBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "cpu",
+                                  src.getModifiedItemAttr("shieldTransportCpuNeedBonus"))
diff --git a/eos/effects/shieldtransporterfalloffbonus.py b/eos/effects/shieldtransporterfalloffbonus.py
index 5cc642bda7..94e282490d 100644
--- a/eos/effects/shieldtransporterfalloffbonus.py
+++ b/eos/effects/shieldtransporterfalloffbonus.py
@@ -6,6 +6,10 @@
 # Ship: Osprey
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
\ No newline at end of file
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("falloffBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster",
+                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/shieldtransportermaxrangebonus.py b/eos/effects/shieldtransportermaxrangebonus.py
index 271e463fca..7ad08c222b 100644
--- a/eos/effects/shieldtransportermaxrangebonus.py
+++ b/eos/effects/shieldtransportermaxrangebonus.py
@@ -4,6 +4,10 @@
 # Ship: Osprey
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster", "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
\ No newline at end of file
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "maxRange",
+                                  ship.getModifiedItemAttr("maxRangeBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster", "maxRange",
+                                  ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py b/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py
index 1a2fefd6d1..2d59d3d3a4 100644
--- a/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py
+++ b/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py
@@ -5,6 +5,8 @@
 # Modules named like: Core Defense Charge Economizer (8 of 8)
 # Skill: Shield Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"),
diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
index 69bafc2a49..7b4d64d3bf 100644
--- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
+++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
@@ -5,6 +5,8 @@
 # Ships from group: Titan (5 of 5)
 # Items from market group: Ships > Capital Ships (32 of 33)
 type = "passive"
+
+
 def handler(fit, ship, context):
     skillName = "Advanced Spaceship Command"
     skill = fit.character.getSkill(skillName)
diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
index 546bc98c9f..d191554577 100644
--- a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
+++ b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py
@@ -5,7 +5,10 @@
 # Ship: Sacrilege
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
     for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2"),
+                               skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmoremresistance1abc1.py b/eos/effects/shiparmoremresistance1abc1.py
index c30eed18de..98ccf2fc8d 100644
--- a/eos/effects/shiparmoremresistance1abc1.py
+++ b/eos/effects/shiparmoremresistance1abc1.py
@@ -4,5 +4,8 @@
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
+                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiparmoremresistanceac2.py b/eos/effects/shiparmoremresistanceac2.py
index b20f70b089..3b38e626ea 100644
--- a/eos/effects/shiparmoremresistanceac2.py
+++ b/eos/effects/shiparmoremresistanceac2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Maller
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/shiparmoremresistanceaf1.py
index e891735904..ba757a5580 100644
--- a/eos/effects/shiparmoremresistanceaf1.py
+++ b/eos/effects/shiparmoremresistanceaf1.py
@@ -5,5 +5,7 @@
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiparmoremresistancemc2.py b/eos/effects/shiparmoremresistancemc2.py
index 2be5737de4..777c51ec0f 100644
--- a/eos/effects/shiparmoremresistancemc2.py
+++ b/eos/effects/shiparmoremresistancemc2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shiparmoremresistancerookie.py b/eos/effects/shiparmoremresistancerookie.py
index 9baaf9c4cc..41cb429c6d 100644
--- a/eos/effects/shiparmoremresistancerookie.py
+++ b/eos/effects/shiparmoremresistancerookie.py
@@ -7,5 +7,7 @@
 # Ship: Phobos
 # Ship: Silver Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorexplosiveresistance1abc1.py b/eos/effects/shiparmorexplosiveresistance1abc1.py
index b80f3d3eb6..f1a9d3a72d 100644
--- a/eos/effects/shiparmorexplosiveresistance1abc1.py
+++ b/eos/effects/shiparmorexplosiveresistance1abc1.py
@@ -4,5 +4,8 @@
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
+                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiparmorexplosiveresistanceac2.py b/eos/effects/shiparmorexplosiveresistanceac2.py
index 68b1c30b3d..76c98a0576 100644
--- a/eos/effects/shiparmorexplosiveresistanceac2.py
+++ b/eos/effects/shiparmorexplosiveresistanceac2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Maller
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
+                           skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmorexplosiveresistancemc2.py b/eos/effects/shiparmorexplosiveresistancemc2.py
index 5f3e48b1f8..f6ef4cfab1 100644
--- a/eos/effects/shiparmorexplosiveresistancemc2.py
+++ b/eos/effects/shiparmorexplosiveresistancemc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
+                           skill="Minmatar Cruiser")
diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/shiparmorexresistanceaf1.py
index 898ed3df3f..448ed9fd3e 100644
--- a/eos/effects/shiparmorexresistanceaf1.py
+++ b/eos/effects/shiparmorexresistanceaf1.py
@@ -5,5 +5,8 @@
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
+                           skill="Amarr Frigate")
diff --git a/eos/effects/shiparmorexresistancerookie.py b/eos/effects/shiparmorexresistancerookie.py
index 35868ef022..a3ffd93332 100644
--- a/eos/effects/shiparmorexresistancerookie.py
+++ b/eos/effects/shiparmorexresistancerookie.py
@@ -7,5 +7,7 @@
 # Ship: Phobos
 # Ship: Silver Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorhpac2.py b/eos/effects/shiparmorhpac2.py
index 5a20e5fafa..a801712c20 100644
--- a/eos/effects/shiparmorhpac2.py
+++ b/eos/effects/shiparmorhpac2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Augoror Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmorkineticresistance1abc1.py b/eos/effects/shiparmorkineticresistance1abc1.py
index 09018a2956..191e500251 100644
--- a/eos/effects/shiparmorkineticresistance1abc1.py
+++ b/eos/effects/shiparmorkineticresistance1abc1.py
@@ -4,5 +4,8 @@
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
+                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiparmorkineticresistanceac2.py b/eos/effects/shiparmorkineticresistanceac2.py
index a2ea82540c..5c96ab767d 100644
--- a/eos/effects/shiparmorkineticresistanceac2.py
+++ b/eos/effects/shiparmorkineticresistanceac2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Maller
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
+                           skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmorkineticresistancemc2.py b/eos/effects/shiparmorkineticresistancemc2.py
index 8d9bf0a3ef..fe1303bd59 100644
--- a/eos/effects/shiparmorkineticresistancemc2.py
+++ b/eos/effects/shiparmorkineticresistancemc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
+                           skill="Minmatar Cruiser")
diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/shiparmorknresistanceaf1.py
index 6263ace6ef..d5d9ea4ac3 100644
--- a/eos/effects/shiparmorknresistanceaf1.py
+++ b/eos/effects/shiparmorknresistanceaf1.py
@@ -5,5 +5,8 @@
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
+                           skill="Amarr Frigate")
diff --git a/eos/effects/shiparmorknresistancerookie.py b/eos/effects/shiparmorknresistancerookie.py
index efc324adfd..9932056eb1 100644
--- a/eos/effects/shiparmorknresistancerookie.py
+++ b/eos/effects/shiparmorknresistancerookie.py
@@ -7,5 +7,7 @@
 # Ship: Phobos
 # Ship: Silver Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shiparmorrepairing1gbc2.py b/eos/effects/shiparmorrepairing1gbc2.py
index a7dc3a8b9e..1c4ca9d091 100644
--- a/eos/effects/shiparmorrepairing1gbc2.py
+++ b/eos/effects/shiparmorrepairing1gbc2.py
@@ -5,6 +5,9 @@
 # Ship: Astarte
 # Ship: Brutix
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2"),
+                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/shiparmorrepairinggf2.py b/eos/effects/shiparmorrepairinggf2.py
index 40370add35..e4da7c41d3 100644
--- a/eos/effects/shiparmorrepairinggf2.py
+++ b/eos/effects/shiparmorrepairinggf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Incursus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"),
+                                  skill="Gallente Frigate")
diff --git a/eos/effects/shiparmorrepairingrookie.py b/eos/effects/shiparmorrepairingrookie.py
index 3103ee3ae4..91a18b03d4 100644
--- a/eos/effects/shiparmorrepairingrookie.py
+++ b/eos/effects/shiparmorrepairingrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "armorDamageAmount", ship.getModifiedItemAttr("rookieArmorRepBonus"))
diff --git a/eos/effects/shiparmorresistanceaf1.py b/eos/effects/shiparmorresistanceaf1.py
index 8c210c9651..651595294f 100644
--- a/eos/effects/shiparmorresistanceaf1.py
+++ b/eos/effects/shiparmorresistanceaf1.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Malediction
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
     for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF"),
+                               skill="Amarr Frigate")
diff --git a/eos/effects/shiparmorthermalresistanceac2.py b/eos/effects/shiparmorthermalresistanceac2.py
index 7226fb62c8..3e3dab2cfa 100644
--- a/eos/effects/shiparmorthermalresistanceac2.py
+++ b/eos/effects/shiparmorthermalresistanceac2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Maller
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
+                           skill="Amarr Cruiser")
diff --git a/eos/effects/shiparmorthermalresistancemc2.py b/eos/effects/shiparmorthermalresistancemc2.py
index 3435ca29c7..85ca998f03 100644
--- a/eos/effects/shiparmorthermalresistancemc2.py
+++ b/eos/effects/shiparmorthermalresistancemc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
+                           skill="Minmatar Cruiser")
diff --git a/eos/effects/shiparmorthermresistance1abc1.py b/eos/effects/shiparmorthermresistance1abc1.py
index 766a6fee0d..b03dffabeb 100644
--- a/eos/effects/shiparmorthermresistance1abc1.py
+++ b/eos/effects/shiparmorthermresistance1abc1.py
@@ -4,5 +4,8 @@
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
+                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/shiparmorthresistanceaf1.py
index 231eb73502..3e01abbc3a 100644
--- a/eos/effects/shiparmorthresistanceaf1.py
+++ b/eos/effects/shiparmorthresistanceaf1.py
@@ -5,5 +5,8 @@
 # Ship: Malice
 # Ship: Punisher
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
+                           skill="Amarr Frigate")
diff --git a/eos/effects/shiparmorthresistancerookie.py b/eos/effects/shiparmorthresistancerookie.py
index 385e27b4b8..3c4a8f2897 100644
--- a/eos/effects/shiparmorthresistancerookie.py
+++ b/eos/effects/shiparmorthresistancerookie.py
@@ -7,5 +7,7 @@
 # Ship: Phobos
 # Ship: Silver Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/shipbonusaf1torpedoexplosionvelocity.py b/eos/effects/shipbonusaf1torpedoexplosionvelocity.py
index 805ba8b4c9..d3be585660 100644
--- a/eos/effects/shipbonusaf1torpedoexplosionvelocity.py
+++ b/eos/effects/shipbonusaf1torpedoexplosionvelocity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Purifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "aoeVelocity", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusaf1torpedoflighttime.py b/eos/effects/shipbonusaf1torpedoflighttime.py
index cc5e5ed7b5..09b679710a 100644
--- a/eos/effects/shipbonusaf1torpedoflighttime.py
+++ b/eos/effects/shipbonusaf1torpedoflighttime.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Purifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "explosionDelay", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusafterburnercapneedatf.py b/eos/effects/shipbonusafterburnercapneedatf.py
index d7e15843ff..2b35616114 100644
--- a/eos/effects/shipbonusafterburnercapneedatf.py
+++ b/eos/effects/shipbonusafterburnercapneedatf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Freki
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/shipbonusafterburnerspeedfactor2cb.py b/eos/effects/shipbonusafterburnerspeedfactor2cb.py
index 5ffa2685b1..f4a0fe1964 100644
--- a/eos/effects/shipbonusafterburnerspeedfactor2cb.py
+++ b/eos/effects/shipbonusafterburnerspeedfactor2cb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nightmare
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "speedFactor", module.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusafterburnerspeedfactorcc2.py b/eos/effects/shipbonusafterburnerspeedfactorcc2.py
index 3578b98776..6a4dbfe2f5 100644
--- a/eos/effects/shipbonusafterburnerspeedfactorcc2.py
+++ b/eos/effects/shipbonusafterburnerspeedfactorcc2.py
@@ -4,6 +4,8 @@
 # Ship: Fiend
 # Ship: Phantasm
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "speedFactor", module.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusafterburnerspeedfactorcf2.py b/eos/effects/shipbonusafterburnerspeedfactorcf2.py
index 7375535617..b8c52da974 100644
--- a/eos/effects/shipbonusafterburnerspeedfactorcf2.py
+++ b/eos/effects/shipbonusafterburnerspeedfactorcf2.py
@@ -4,6 +4,8 @@
 # Ship: Imp
 # Ship: Succubus
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
                                   "speedFactor", module.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonusagilityai2.py b/eos/effects/shipbonusagilityai2.py
index d92a8edb9c..16c2537ad6 100644
--- a/eos/effects/shipbonusagilityai2.py
+++ b/eos/effects/shipbonusagilityai2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Sigil
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial")
diff --git a/eos/effects/shipbonusagilityci2.py b/eos/effects/shipbonusagilityci2.py
index 479786f708..2fccf4074c 100644
--- a/eos/effects/shipbonusagilityci2.py
+++ b/eos/effects/shipbonusagilityci2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Badger
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/shipbonusagilitygi2.py b/eos/effects/shipbonusagilitygi2.py
index 26dba42a9c..3fc84bb06c 100644
--- a/eos/effects/shipbonusagilitygi2.py
+++ b/eos/effects/shipbonusagilitygi2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Nereus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
diff --git a/eos/effects/shipbonusagilitymi2.py b/eos/effects/shipbonusagilitymi2.py
index 8c5a1fb499..8273934e57 100644
--- a/eos/effects/shipbonusagilitymi2.py
+++ b/eos/effects/shipbonusagilitymi2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Wreathe
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/shipbonusammobaymi2.py b/eos/effects/shipbonusammobaymi2.py
index d17a65aa36..8bb93aaeb4 100644
--- a/eos/effects/shipbonusammobaymi2.py
+++ b/eos/effects/shipbonusammobaymi2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Hoarder
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
+    fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2"),
+                           skill="Minmatar Industrial")
diff --git a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
index 9fcd68b867..240b2f5ca8 100644
--- a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
+++ b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Golem
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
+        "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py b/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py
index 90abc91df2..1bf11ce1a8 100644
--- a/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py
+++ b/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship")
+                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusaoevelocityrocketscd2.py b/eos/effects/shipbonusaoevelocityrocketscd2.py
index 8d4a1f11be..3513d90254 100644
--- a/eos/effects/shipbonusaoevelocityrocketscd2.py
+++ b/eos/effects/shipbonusaoevelocityrocketscd2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Corax
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusaoevelocityrocketsmf.py b/eos/effects/shipbonusaoevelocityrocketsmf.py
index c67e6a4a9c..3e7de55ef6 100644
--- a/eos/effects/shipbonusaoevelocityrocketsmf.py
+++ b/eos/effects/shipbonusaoevelocityrocketsmf.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vigil Fleet Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity",
+                                    src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
index 7e396fca5f..c493244392 100644
--- a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
+++ b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Corax
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusarmorrepairai2.py b/eos/effects/shipbonusarmorrepairai2.py
index 4eb27de160..172163178e 100644
--- a/eos/effects/shipbonusarmorrepairai2.py
+++ b/eos/effects/shipbonusarmorrepairai2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Impel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2"),
+                                  skill="Amarr Industrial")
diff --git a/eos/effects/shipbonusarmorrepairgi2.py b/eos/effects/shipbonusarmorrepairgi2.py
index ea4216fb3e..3699a8b1e4 100644
--- a/eos/effects/shipbonusarmorrepairgi2.py
+++ b/eos/effects/shipbonusarmorrepairgi2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Occator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2"),
+                                  skill="Gallente Industrial")
diff --git a/eos/effects/shipbonusarmorrepamountgc2.py b/eos/effects/shipbonusarmorrepamountgc2.py
index 7b5e66cadf..622b593fd9 100644
--- a/eos/effects/shipbonusarmorrepamountgc2.py
+++ b/eos/effects/shipbonusarmorrepamountgc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Deimos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/shipbonusarmorresistab.py
index 7eed166670..cc33518440 100644
--- a/eos/effects/shipbonusarmorresistab.py
+++ b/eos/effects/shipbonusarmorresistab.py
@@ -4,6 +4,9 @@
 # Ship: Abaddon
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB"),
+                               skill="Amarr Battleship")
diff --git a/eos/effects/shipbonuscapcapab.py b/eos/effects/shipbonuscapcapab.py
index 7e28253c78..73ccc8035c 100644
--- a/eos/effects/shipbonuscapcapab.py
+++ b/eos/effects/shipbonuscapcapab.py
@@ -4,5 +4,7 @@
 # Ship: Apocalypse Imperial Issue
 # Ship: Paladin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/shipbonuscargo2gi.py
index 95b1530f78..85388f3122 100644
--- a/eos/effects/shipbonuscargo2gi.py
+++ b/eos/effects/shipbonuscargo2gi.py
@@ -5,6 +5,8 @@
 # Variations of ship: Nereus (2 of 2)
 # Ship: Iteron Mark V
 type = "passive"
+
+
 def handler(fit, ship, context):
     # TODO: investigate if we can live without such ifs or hardcoding
     # Viator doesn't have GI bonus
diff --git a/eos/effects/shipbonuscargoci.py b/eos/effects/shipbonuscargoci.py
index 3381551642..3e80fb36ab 100644
--- a/eos/effects/shipbonuscargoci.py
+++ b/eos/effects/shipbonuscargoci.py
@@ -4,5 +4,7 @@
 # Variations of ship: Badger (2 of 2)
 # Ship: Tayra
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/shipbonuscargomi.py
index f8adc0250b..bc98e36154 100644
--- a/eos/effects/shipbonuscargomi.py
+++ b/eos/effects/shipbonuscargomi.py
@@ -4,5 +4,7 @@
 # Variations of ship: Wreathe (2 of 2)
 # Ship: Mammoth
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/shipbonuscarriera1armorresists.py b/eos/effects/shipbonuscarriera1armorresists.py
index 2e90ea3730..ebda73d9d5 100644
--- a/eos/effects/shipbonuscarriera1armorresists.py
+++ b/eos/effects/shipbonuscarriera1armorresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"), skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
+                           skill="Amarr Carrier")
diff --git a/eos/effects/shipbonuscarriera2supportfighterbonus.py b/eos/effects/shipbonuscarriera2supportfighterbonus.py
index c226a07e59..02228b9c65 100644
--- a/eos/effects/shipbonuscarriera2supportfighterbonus.py
+++ b/eos/effects/shipbonuscarriera2supportfighterbonus.py
@@ -3,6 +3,11 @@
 # Used by:
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange", src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterAbilityEnergyNeutralizerOptimalRange", src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
+                                   "fighterAbilityEnergyNeutralizerOptimalRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonuscarriera4warfarelinksbonus.py b/eos/effects/shipbonuscarriera4warfarelinksbonus.py
index 96716c37f3..c639f344bf 100644
--- a/eos/effects/shipbonuscarriera4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarriera4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Archon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonuscarrierc1shieldresists.py b/eos/effects/shipbonuscarrierc1shieldresists.py
index 195b1a2afe..4b8cd71019 100644
--- a/eos/effects/shipbonuscarrierc1shieldresists.py
+++ b/eos/effects/shipbonuscarrierc1shieldresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Chimera
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"), skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
+                           skill="Caldari Carrier")
diff --git a/eos/effects/shipbonuscarrierc2supportfighterbonus.py b/eos/effects/shipbonuscarrierc2supportfighterbonus.py
index 96ae4beb07..ff46a2d1de 100644
--- a/eos/effects/shipbonuscarrierc2supportfighterbonus.py
+++ b/eos/effects/shipbonuscarrierc2supportfighterbonus.py
@@ -3,6 +3,11 @@
 # Used by:
 # Ship: Chimera
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange", src.getModifiedItemAttr("shipBonusCarrierC2"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterAbilityECMRangeOptimal", src.getModifiedItemAttr("shipBonusCarrierC2"), skill="Caldari Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierC2"), skill="Caldari Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
+                                   "fighterAbilityECMRangeOptimal", src.getModifiedItemAttr("shipBonusCarrierC2"),
+                                   skill="Caldari Carrier")
diff --git a/eos/effects/shipbonuscarrierc4warfarelinksbonus.py b/eos/effects/shipbonuscarrierc4warfarelinksbonus.py
index b47c3eaabb..8612d190e7 100644
--- a/eos/effects/shipbonuscarrierc4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierc4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Chimera
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
diff --git a/eos/effects/shipbonuscarrierg1fighterdamage.py b/eos/effects/shipbonuscarrierg1fighterdamage.py
index dbd2ef63b8..e17ff621af 100644
--- a/eos/effects/shipbonuscarrierg1fighterdamage.py
+++ b/eos/effects/shipbonuscarrierg1fighterdamage.py
@@ -3,7 +3,15 @@
 # Used by:
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonuscarrierg1fighterdamageandhitpoints.py b/eos/effects/shipbonuscarrierg1fighterdamageandhitpoints.py
index df81f47ac5..edc2c2077c 100644
--- a/eos/effects/shipbonuscarrierg1fighterdamageandhitpoints.py
+++ b/eos/effects/shipbonuscarrierg1fighterdamageandhitpoints.py
@@ -3,8 +3,17 @@
 # Used by:
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonuscarrierg2supportfighterbonus.py b/eos/effects/shipbonuscarrierg2supportfighterbonus.py
index 05ba1172d2..e3bfe9f1fd 100644
--- a/eos/effects/shipbonuscarrierg2supportfighterbonus.py
+++ b/eos/effects/shipbonuscarrierg2supportfighterbonus.py
@@ -3,6 +3,11 @@
 # Used by:
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange", src.getModifiedItemAttr("shipBonusCarrierG2"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterAbilityWarpDisruptionRange", src.getModifiedItemAttr("shipBonusCarrierG2"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierG2"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
+                                   "fighterAbilityWarpDisruptionRange", src.getModifiedItemAttr("shipBonusCarrierG2"),
+                                   skill="Gallente Carrier")
diff --git a/eos/effects/shipbonuscarrierg3fighterhitpoints.py b/eos/effects/shipbonuscarrierg3fighterhitpoints.py
index 40b568fb38..4ad0965d00 100644
--- a/eos/effects/shipbonuscarrierg3fighterhitpoints.py
+++ b/eos/effects/shipbonuscarrierg3fighterhitpoints.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("shipBonusCarrierG3"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shipBonusCarrierG3"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonuscarrierg4warfarelinksbonus.py b/eos/effects/shipbonuscarrierg4warfarelinksbonus.py
index d7518eb286..40301427d7 100644
--- a/eos/effects/shipbonuscarrierg4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierg4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Thanatos
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonuscarrierm1fighterdamage.py b/eos/effects/shipbonuscarrierm1fighterdamage.py
index 954d783fb0..2189478053 100644
--- a/eos/effects/shipbonuscarrierm1fighterdamage.py
+++ b/eos/effects/shipbonuscarrierm1fighterdamage.py
@@ -3,7 +3,15 @@
 # Used by:
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonuscarrierm1fighterdamageandvelocity.py b/eos/effects/shipbonuscarrierm1fighterdamageandvelocity.py
index fbd629a736..d15acda6a9 100644
--- a/eos/effects/shipbonuscarrierm1fighterdamageandvelocity.py
+++ b/eos/effects/shipbonuscarrierm1fighterdamageandvelocity.py
@@ -3,8 +3,17 @@
 # Used by:
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonuscarrierm2supportfighterbonus.py b/eos/effects/shipbonuscarrierm2supportfighterbonus.py
index 6dd2c85184..e28ccbfef8 100644
--- a/eos/effects/shipbonuscarrierm2supportfighterbonus.py
+++ b/eos/effects/shipbonuscarrierm2supportfighterbonus.py
@@ -3,6 +3,11 @@
 # Used by:
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange", src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterAbilityStasisWebifierOptimalRange", src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
+                                   "fighterAbilityStasisWebifierOptimalRange",
+                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonuscarrierm3fightervelocity.py b/eos/effects/shipbonuscarrierm3fightervelocity.py
index a880ddcdf7..63d22459a9 100644
--- a/eos/effects/shipbonuscarrierm3fightervelocity.py
+++ b/eos/effects/shipbonuscarrierm3fightervelocity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("shipBonusCarrierM3"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("shipBonusCarrierM3"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonuscarrierm4warfarelinksbonus.py b/eos/effects/shipbonuscarrierm4warfarelinksbonus.py
index 4f47e89545..5847044632 100644
--- a/eos/effects/shipbonuscarrierm4warfarelinksbonus.py
+++ b/eos/effects/shipbonuscarrierm4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Nidhoggur
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonuscarrierrole1numwarfarelinks.py b/eos/effects/shipbonuscarrierrole1numwarfarelinks.py
index e2fde5322b..fdfc77d947 100644
--- a/eos/effects/shipbonuscarrierrole1numwarfarelinks.py
+++ b/eos/effects/shipbonuscarrierrole1numwarfarelinks.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Carrier (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole1"))
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
+                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/shipbonuscf1torpedoexplosionvelocity.py b/eos/effects/shipbonuscf1torpedoexplosionvelocity.py
index 3c18d96fb4..41a8b9db85 100644
--- a/eos/effects/shipbonuscf1torpedoexplosionvelocity.py
+++ b/eos/effects/shipbonuscf1torpedoexplosionvelocity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Manticore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "aoeVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonuscf1torpedoflighttime.py b/eos/effects/shipbonuscf1torpedoflighttime.py
index b107b5bc3b..2f00bd5154 100644
--- a/eos/effects/shipbonuscf1torpedoflighttime.py
+++ b/eos/effects/shipbonuscf1torpedoflighttime.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Manticore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "explosionDelay", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonuscruisemissileemdmgmb.py b/eos/effects/shipbonuscruisemissileemdmgmb.py
index 4de20283af..7a79cd0898 100644
--- a/eos/effects/shipbonuscruisemissileemdmgmb.py
+++ b/eos/effects/shipbonuscruisemissileemdmgmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonuscruisemissileexplodmgmb.py b/eos/effects/shipbonuscruisemissileexplodmgmb.py
index 43579fd904..d4c4139873 100644
--- a/eos/effects/shipbonuscruisemissileexplodmgmb.py
+++ b/eos/effects/shipbonuscruisemissileexplodmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonuscruisemissilekineticdmgmb.py b/eos/effects/shipbonuscruisemissilekineticdmgmb.py
index 291f941e18..33fa55ff9c 100644
--- a/eos/effects/shipbonuscruisemissilekineticdmgmb.py
+++ b/eos/effects/shipbonuscruisemissilekineticdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonuscruisemissilethermdmgmb.py b/eos/effects/shipbonuscruisemissilethermdmgmb.py
index b5b094dfdf..701dcf7e5a 100644
--- a/eos/effects/shipbonuscruisemissilethermdmgmb.py
+++ b/eos/effects/shipbonuscruisemissilethermdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonuscruiserofmb.py b/eos/effects/shipbonuscruiserofmb.py
index 31d7e53940..34dc736d25 100644
--- a/eos/effects/shipbonuscruiserofmb.py
+++ b/eos/effects/shipbonuscruiserofmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
                                   "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusdreadcitadelcruiserofc1.py b/eos/effects/shipbonusdreadcitadelcruiserofc1.py
index 3d815d693e..f4c82794a9 100644
--- a/eos/effects/shipbonusdreadcitadelcruiserofc1.py
+++ b/eos/effects/shipbonusdreadcitadelcruiserofc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought")
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"),
+                                  skill="Caldari Dreadnought")
diff --git a/eos/effects/shipbonusdreadcitadeltorprofc1.py b/eos/effects/shipbonusdreadcitadeltorprofc1.py
index 74ac8e7fad..fa1944b6dc 100644
--- a/eos/effects/shipbonusdreadcitadeltorprofc1.py
+++ b/eos/effects/shipbonusdreadcitadeltorprofc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought")
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"),
+                                  skill="Caldari Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughta1damagebonus.py b/eos/effects/shipbonusdreadnoughta1damagebonus.py
index 03dff96c92..3b85fee4af 100644
--- a/eos/effects/shipbonusdreadnoughta1damagebonus.py
+++ b/eos/effects/shipbonusdreadnoughta1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Revelation
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughta2armorresists.py b/eos/effects/shipbonusdreadnoughta2armorresists.py
index b1fbada098..207c827f01 100644
--- a/eos/effects/shipbonusdreadnoughta2armorresists.py
+++ b/eos/effects/shipbonusdreadnoughta2armorresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Revelation
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"), skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"), skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"), skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"), skill="Amarr Dreadnought")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
+                           skill="Amarr Dreadnought")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
+                           skill="Amarr Dreadnought")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
+                           skill="Amarr Dreadnought")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
+                           skill="Amarr Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughta3capneed.py b/eos/effects/shipbonusdreadnoughta3capneed.py
index 515c7e0263..1571c46bfb 100644
--- a/eos/effects/shipbonusdreadnoughta3capneed.py
+++ b/eos/effects/shipbonusdreadnoughta3capneed.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Revelation
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed", src.getModifiedItemAttr("shipBonusDreadnoughtA3"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtA3"), skill="Amarr Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtc1damagebonus.py b/eos/effects/shipbonusdreadnoughtc1damagebonus.py
index 0fb110a9e5..9d06fd5dbf 100644
--- a/eos/effects/shipbonusdreadnoughtc1damagebonus.py
+++ b/eos/effects/shipbonusdreadnoughtc1damagebonus.py
@@ -3,16 +3,30 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage", src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtc2shieldresists.py b/eos/effects/shipbonusdreadnoughtc2shieldresists.py
index f8704bc739..9179c65ec0 100644
--- a/eos/effects/shipbonusdreadnoughtc2shieldresists.py
+++ b/eos/effects/shipbonusdreadnoughtc2shieldresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"), skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"), skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"), skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"), skill="Caldari Dreadnought")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
+                           skill="Caldari Dreadnought")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
+                           skill="Caldari Dreadnought")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
+                           skill="Caldari Dreadnought")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
+                           skill="Caldari Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtc3reloadbonus.py b/eos/effects/shipbonusdreadnoughtc3reloadbonus.py
index 71d7353cfd..8ba0cc3fcd 100644
--- a/eos/effects/shipbonusdreadnoughtc3reloadbonus.py
+++ b/eos/effects/shipbonusdreadnoughtc3reloadbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Phoenix
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "reloadTime", src.getModifiedItemAttr("shipBonusDreadnoughtC3"), skill="Caldari Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "reloadTime",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtC3"), skill="Caldari Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtg1damagebonus.py b/eos/effects/shipbonusdreadnoughtg1damagebonus.py
index 343616f661..d6d5b90745 100644
--- a/eos/effects/shipbonusdreadnoughtg1damagebonus.py
+++ b/eos/effects/shipbonusdreadnoughtg1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Moros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtg2rofbonus.py b/eos/effects/shipbonusdreadnoughtg2rofbonus.py
index b0957e9c64..b109e3e302 100644
--- a/eos/effects/shipbonusdreadnoughtg2rofbonus.py
+++ b/eos/effects/shipbonusdreadnoughtg2rofbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Moros (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed", src.getModifiedItemAttr("shipBonusDreadnoughtG2"), skill="Gallente Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG2"), skill="Gallente Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtg3repairtime.py b/eos/effects/shipbonusdreadnoughtg3repairtime.py
index 9b764ccf74..39b99c0f54 100644
--- a/eos/effects/shipbonusdreadnoughtg3repairtime.py
+++ b/eos/effects/shipbonusdreadnoughtg3repairtime.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Moros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusDreadnoughtG3"), skill="Gallente Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "duration",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG3"), skill="Gallente Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm1damagebonus.py b/eos/effects/shipbonusdreadnoughtm1damagebonus.py
index 1117b294cc..c1de5b9f43 100644
--- a/eos/effects/shipbonusdreadnoughtm1damagebonus.py
+++ b/eos/effects/shipbonusdreadnoughtm1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Naglfar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm1webbonus.py b/eos/effects/shipbonusdreadnoughtm1webbonus.py
index d0adb6354d..040ce50868 100644
--- a/eos/effects/shipbonusdreadnoughtm1webbonus.py
+++ b/eos/effects/shipbonusdreadnoughtm1webbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vehement
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm2rofbonus.py b/eos/effects/shipbonusdreadnoughtm2rofbonus.py
index a92dea0a39..c183f3c7b1 100644
--- a/eos/effects/shipbonusdreadnoughtm2rofbonus.py
+++ b/eos/effects/shipbonusdreadnoughtm2rofbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Naglfar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm3repairtime.py b/eos/effects/shipbonusdreadnoughtm3repairtime.py
index dab9cd5fb0..0e5ca87f9a 100644
--- a/eos/effects/shipbonusdreadnoughtm3repairtime.py
+++ b/eos/effects/shipbonusdreadnoughtm3repairtime.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Naglfar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "duration", src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "duration",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtrole1damagebonus.py b/eos/effects/shipbonusdreadnoughtrole1damagebonus.py
index e25f3e6b91..0cba1617ae 100644
--- a/eos/effects/shipbonusdreadnoughtrole1damagebonus.py
+++ b/eos/effects/shipbonusdreadnoughtrole1damagebonus.py
@@ -3,7 +3,8 @@
 # Used by:
 # Ship: Vehement
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole1"))
-
diff --git a/eos/effects/shipbonusdronearmorhitpointsab.py b/eos/effects/shipbonusdronearmorhitpointsab.py
index 366217f227..4753c8f3ff 100644
--- a/eos/effects/shipbonusdronearmorhitpointsab.py
+++ b/eos/effects/shipbonusdronearmorhitpointsab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusdronearmorhitpointsgf2.py b/eos/effects/shipbonusdronearmorhitpointsgf2.py
index ffab2d3fac..89cdf8e30b 100644
--- a/eos/effects/shipbonusdronearmorhitpointsgf2.py
+++ b/eos/effects/shipbonusdronearmorhitpointsgf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishkur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusdronedamagegf2.py b/eos/effects/shipbonusdronedamagegf2.py
index ac5f556437..5f71d4b0ff 100644
--- a/eos/effects/shipbonusdronedamagegf2.py
+++ b/eos/effects/shipbonusdronedamagegf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Utu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusdronedamagemultiplierab.py b/eos/effects/shipbonusdronedamagemultiplierab.py
index dc0f2f271e..3825f9bb3c 100644
--- a/eos/effects/shipbonusdronedamagemultiplierab.py
+++ b/eos/effects/shipbonusdronedamagemultiplierab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusdronedamagemultiplierabc2.py b/eos/effects/shipbonusdronedamagemultiplierabc2.py
index a87f57a3be..b93e05392c 100644
--- a/eos/effects/shipbonusdronedamagemultiplierabc2.py
+++ b/eos/effects/shipbonusdronedamagemultiplierabc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Prophecy
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
+                                 skill="Amarr Battlecruiser")
diff --git a/eos/effects/shipbonusdronedamagemultiplierac2.py b/eos/effects/shipbonusdronedamagemultiplierac2.py
index 9e7f823a80..24e2848177 100644
--- a/eos/effects/shipbonusdronedamagemultiplierac2.py
+++ b/eos/effects/shipbonusdronedamagemultiplierac2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Arbitrator (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusdronedamagemultiplierad1.py b/eos/effects/shipbonusdronedamagemultiplierad1.py
index b18b20bcba..3112585a89 100644
--- a/eos/effects/shipbonusdronedamagemultiplierad1.py
+++ b/eos/effects/shipbonusdronedamagemultiplierad1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Dragoon (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
+                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py
index 776ac9abf3..19ea8bdde8 100644
--- a/eos/effects/shipbonusdronedamagemultipliergb2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergb2.py
@@ -4,6 +4,9 @@
 # Variations of ship: Dominix (3 of 3)
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2"),
+                                 skill="Gallente Battleship")
diff --git a/eos/effects/shipbonusdronedamagemultipliergbc1.py b/eos/effects/shipbonusdronedamagemultipliergbc1.py
index ab07e9c71c..b1f3abe8e7 100644
--- a/eos/effects/shipbonusdronedamagemultipliergbc1.py
+++ b/eos/effects/shipbonusdronedamagemultipliergbc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Myrmidon (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser")
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
+                                 skill="Gallente Battlecruiser")
diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py
index e2933b8320..9585f7590f 100644
--- a/eos/effects/shipbonusdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergc2.py
@@ -5,6 +5,8 @@
 # Ship: Vexor
 # Ship: Vexor Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusdronedamagemultipliergd1.py b/eos/effects/shipbonusdronedamagemultipliergd1.py
index b033f6d34e..28ba5adfc9 100644
--- a/eos/effects/shipbonusdronedamagemultipliergd1.py
+++ b/eos/effects/shipbonusdronedamagemultipliergd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Algos (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
+                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusdronedamagemultiplierrookie.py b/eos/effects/shipbonusdronedamagemultiplierrookie.py
index b27b566925..58e088f8ba 100644
--- a/eos/effects/shipbonusdronedamagemultiplierrookie.py
+++ b/eos/effects/shipbonusdronedamagemultiplierrookie.py
@@ -6,6 +6,8 @@
 # Ship: Taipan
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier", ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/shipbonusdronehitpointsabc2.py b/eos/effects/shipbonusdronehitpointsabc2.py
index 209241457e..b1738a3009 100644
--- a/eos/effects/shipbonusdronehitpointsabc2.py
+++ b/eos/effects/shipbonusdronehitpointsabc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Prophecy
 type = "passive"
+
+
 def handler(fit, ship, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsad1.py b/eos/effects/shipbonusdronehitpointsad1.py
index 3caf0535b7..4015c8f2e2 100644
--- a/eos/effects/shipbonusdronehitpointsad1.py
+++ b/eos/effects/shipbonusdronehitpointsad1.py
@@ -3,7 +3,12 @@
 # Used by:
 # Variations of ship: Dragoon (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
+                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
+                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
+                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusdronehitpointsfixedac2.py b/eos/effects/shipbonusdronehitpointsfixedac2.py
index 36dbd19072..b761c859b2 100644
--- a/eos/effects/shipbonusdronehitpointsfixedac2.py
+++ b/eos/effects/shipbonusdronehitpointsfixedac2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Arbitrator (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py
index 3570eee628..9a591a4bc7 100644
--- a/eos/effects/shipbonusdronehitpointsgb2.py
+++ b/eos/effects/shipbonusdronehitpointsgb2.py
@@ -4,6 +4,8 @@
 # Variations of ship: Dominix (3 of 3)
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsgbc1.py b/eos/effects/shipbonusdronehitpointsgbc1.py
index 9b6d29c11b..36f77064ea 100644
--- a/eos/effects/shipbonusdronehitpointsgbc1.py
+++ b/eos/effects/shipbonusdronehitpointsgbc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Myrmidon (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py
index 6b3b8ce66b..8dabc04f0d 100644
--- a/eos/effects/shipbonusdronehitpointsgc2.py
+++ b/eos/effects/shipbonusdronehitpointsgc2.py
@@ -5,6 +5,8 @@
 # Ship: Vexor
 # Ship: Vexor Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsgd1.py b/eos/effects/shipbonusdronehitpointsgd1.py
index 9866837014..e82e28b1a4 100644
--- a/eos/effects/shipbonusdronehitpointsgd1.py
+++ b/eos/effects/shipbonusdronehitpointsgd1.py
@@ -3,7 +3,12 @@
 # Used by:
 # Variations of ship: Algos (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
+                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
+                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
+                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py
index 03f6cf7294..62058ca89a 100644
--- a/eos/effects/shipbonusdronehitpointsgf.py
+++ b/eos/effects/shipbonusdronehitpointsgf.py
@@ -5,6 +5,8 @@
 # Ship: Maulus Navy Issue
 # Ship: Tristan
 type = "passive"
+
+
 def handler(fit, ship, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
diff --git a/eos/effects/shipbonusdronehitpointsgf2.py b/eos/effects/shipbonusdronehitpointsgf2.py
index 1b9c0d3826..a2e993f1be 100644
--- a/eos/effects/shipbonusdronehitpointsgf2.py
+++ b/eos/effects/shipbonusdronehitpointsgf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishkur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "hp", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusdronehitpointsrookie.py b/eos/effects/shipbonusdronehitpointsrookie.py
index dad9c4e995..fa22f9a91f 100644
--- a/eos/effects/shipbonusdronehitpointsrookie.py
+++ b/eos/effects/shipbonusdronehitpointsrookie.py
@@ -6,7 +6,9 @@
 # Ship: Taipan
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("rookieDroneBonus"))
\ No newline at end of file
+                                     type, ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/shipbonusdroneminingamountac2.py b/eos/effects/shipbonusdroneminingamountac2.py
index b268d74437..4e314a7b76 100644
--- a/eos/effects/shipbonusdroneminingamountac2.py
+++ b/eos/effects/shipbonusdroneminingamountac2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Arbitrator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone",
                                  "miningAmount", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusdroneminingamountgc2.py b/eos/effects/shipbonusdroneminingamountgc2.py
index eb904aebd2..b13344744a 100644
--- a/eos/effects/shipbonusdroneminingamountgc2.py
+++ b/eos/effects/shipbonusdroneminingamountgc2.py
@@ -4,6 +4,8 @@
 # Ship: Vexor
 # Ship: Vexor Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone",
                                  "miningAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusdronemwdboostgc.py b/eos/effects/shipbonusdronemwdboostgc.py
index b89433e4f0..617b0a7a54 100644
--- a/eos/effects/shipbonusdronemwdboostgc.py
+++ b/eos/effects/shipbonusdronemwdboostgc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vexor Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusdronemwdboostrole.py b/eos/effects/shipbonusdronemwdboostrole.py
index 036dddc671..6b342b2b03 100644
--- a/eos/effects/shipbonusdronemwdboostrole.py
+++ b/eos/effects/shipbonusdronemwdboostrole.py
@@ -4,6 +4,8 @@
 # Ship: Algos
 # Ship: Dragoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusdroneoptimalrangegb.py b/eos/effects/shipbonusdroneoptimalrangegb.py
index 0b7cf2d8d9..197aba8ac6 100644
--- a/eos/effects/shipbonusdroneoptimalrangegb.py
+++ b/eos/effects/shipbonusdroneoptimalrangegb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Dominix
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shipbonusdroneshieldhitpointsab.py b/eos/effects/shipbonusdroneshieldhitpointsab.py
index 45583dc411..e0ed555891 100644
--- a/eos/effects/shipbonusdroneshieldhitpointsab.py
+++ b/eos/effects/shipbonusdroneshieldhitpointsab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusdroneshieldhitpointsgf2.py b/eos/effects/shipbonusdroneshieldhitpointsgf2.py
index 01f4c61220..4a4ca98aea 100644
--- a/eos/effects/shipbonusdroneshieldhitpointsgf2.py
+++ b/eos/effects/shipbonusdroneshieldhitpointsgf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishkur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusdronestructurehitpointsab.py b/eos/effects/shipbonusdronestructurehitpointsab.py
index 3fc42ee653..a37f00d0ca 100644
--- a/eos/effects/shipbonusdronestructurehitpointsab.py
+++ b/eos/effects/shipbonusdronestructurehitpointsab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "hp", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusdronetrackinggb.py b/eos/effects/shipbonusdronetrackinggb.py
index f82784f41e..8449ffc783 100644
--- a/eos/effects/shipbonusdronetrackinggb.py
+++ b/eos/effects/shipbonusdronetrackinggb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Dominix
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shipbonusdronetrackinggc.py b/eos/effects/shipbonusdronetrackinggc.py
index e6ce626d9e..c33d4f02fc 100644
--- a/eos/effects/shipbonusdronetrackinggc.py
+++ b/eos/effects/shipbonusdronetrackinggc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vexor Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/shipbonusdronetrackinggf.py
index c6ec28d2cb..b98c308e02 100644
--- a/eos/effects/shipbonusdronetrackinggf.py
+++ b/eos/effects/shipbonusdronetrackinggf.py
@@ -4,6 +4,8 @@
 # Ship: Maulus Navy Issue
 # Ship: Tristan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusecmstrengthbonuscc.py b/eos/effects/shipbonusecmstrengthbonuscc.py
index 0865be8946..1eaf7ef56d 100644
--- a/eos/effects/shipbonusecmstrengthbonuscc.py
+++ b/eos/effects/shipbonusecmstrengthbonuscc.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Blackbird
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("Gravimetric", "Magnetometric", "Ladar", "Radar"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
+                                      "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC"),
+                                      skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonuselitecover2torpedoemdamage.py b/eos/effects/shipbonuselitecover2torpedoemdamage.py
index 03dd494666..6db342ce50 100644
--- a/eos/effects/shipbonuselitecover2torpedoemdamage.py
+++ b/eos/effects/shipbonuselitecover2torpedoemdamage.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Purifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
diff --git a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py b/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
index f9a3b9203c..29c7a57556 100644
--- a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
+++ b/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hound
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/shipbonuselitecover2torpedokineticdamage.py b/eos/effects/shipbonuselitecover2torpedokineticdamage.py
index 4389f1de36..811f14ee20 100644
--- a/eos/effects/shipbonuselitecover2torpedokineticdamage.py
+++ b/eos/effects/shipbonuselitecover2torpedokineticdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Manticore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
+                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/shipbonuselitecover2torpedothermaldamage.py b/eos/effects/shipbonuselitecover2torpedothermaldamage.py
index 5cc0957d29..245685e411 100644
--- a/eos/effects/shipbonuselitecover2torpedothermaldamage.py
+++ b/eos/effects/shipbonuselitecover2torpedothermaldamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Nemesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/shipbonusemarmorresistancead2.py b/eos/effects/shipbonusemarmorresistancead2.py
index 7bc317a77a..745d644205 100644
--- a/eos/effects/shipbonusemarmorresistancead2.py
+++ b/eos/effects/shipbonusemarmorresistancead2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Pontifex
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusemarmorresistancegd2.py b/eos/effects/shipbonusemarmorresistancegd2.py
index bd2d537244..0c7feb03a7 100644
--- a/eos/effects/shipbonusemarmorresistancegd2.py
+++ b/eos/effects/shipbonusemarmorresistancegd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Magus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
+                           skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusemmissiledamagecd1.py b/eos/effects/shipbonusemmissiledamagecd1.py
index 4c5a36d8fe..db491c2b44 100644
--- a/eos/effects/shipbonusemmissiledamagecd1.py
+++ b/eos/effects/shipbonusemmissiledamagecd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusemmissiledmgmd1.py b/eos/effects/shipbonusemmissiledmgmd1.py
index 9f1e5175c8..cab9793321 100644
--- a/eos/effects/shipbonusemmissiledmgmd1.py
+++ b/eos/effects/shipbonusemmissiledmgmd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py
index 145d4b3b3b..4e9cdf83d6 100644
--- a/eos/effects/shipbonusemshieldresistancecb2.py
+++ b/eos/effects/shipbonusemshieldresistancecb2.py
@@ -5,5 +5,8 @@
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
+                           skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusemshieldresistancemd2.py b/eos/effects/shipbonusemshieldresistancemd2.py
index c25f179dad..526ad3cafe 100644
--- a/eos/effects/shipbonusemshieldresistancemd2.py
+++ b/eos/effects/shipbonusemshieldresistancemd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
+                           skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusenergyneutfalloffab2.py b/eos/effects/shipbonusenergyneutfalloffab2.py
index e49217c816..7540842ce3 100644
--- a/eos/effects/shipbonusenergyneutfalloffab2.py
+++ b/eos/effects/shipbonusenergyneutfalloffab2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutfalloffac3.py b/eos/effects/shipbonusenergyneutfalloffac3.py
index 3434e69888..fe991894d5 100644
--- a/eos/effects/shipbonusenergyneutfalloffac3.py
+++ b/eos/effects/shipbonusenergyneutfalloffac3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergyneutfalloffad1.py b/eos/effects/shipbonusenergyneutfalloffad1.py
index cf34118ff9..9f515fe44b 100644
--- a/eos/effects/shipbonusenergyneutfalloffad1.py
+++ b/eos/effects/shipbonusenergyneutfalloffad1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dragoon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergyneutfalloffaf3.py b/eos/effects/shipbonusenergyneutfalloffaf3.py
index 248ed9f360..f2f20904da 100644
--- a/eos/effects/shipbonusenergyneutfalloffaf3.py
+++ b/eos/effects/shipbonusenergyneutfalloffaf3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergyneutfalloffeaf3.py b/eos/effects/shipbonusenergyneutfalloffeaf3.py
index f4a99fa853..54a1a972ad 100644
--- a/eos/effects/shipbonusenergyneutfalloffeaf3.py
+++ b/eos/effects/shipbonusenergyneutfalloffeaf3.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergyneutfalloffrs2.py b/eos/effects/shipbonusenergyneutfalloffrs2.py
index 350e3d1993..8299434e60 100644
--- a/eos/effects/shipbonusenergyneutfalloffrs2.py
+++ b/eos/effects/shipbonusenergyneutfalloffrs2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutfalloffrs3.py b/eos/effects/shipbonusenergyneutfalloffrs3.py
index f3396dc37a..47434368d0 100644
--- a/eos/effects/shipbonusenergyneutfalloffrs3.py
+++ b/eos/effects/shipbonusenergyneutfalloffrs3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Curse
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalab.py b/eos/effects/shipbonusenergyneutoptimalab.py
index 7e887f0e6f..c8a3351dcf 100644
--- a/eos/effects/shipbonusenergyneutoptimalab.py
+++ b/eos/effects/shipbonusenergyneutoptimalab.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutoptimalac1.py b/eos/effects/shipbonusenergyneutoptimalac1.py
index b66e58a461..10d1d52915 100644
--- a/eos/effects/shipbonusenergyneutoptimalac1.py
+++ b/eos/effects/shipbonusenergyneutoptimalac1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergyneutoptimalad2.py b/eos/effects/shipbonusenergyneutoptimalad2.py
index 682a574adb..de8d4804ca 100644
--- a/eos/effects/shipbonusenergyneutoptimalad2.py
+++ b/eos/effects/shipbonusenergyneutoptimalad2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dragoon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergyneutoptimalaf2.py b/eos/effects/shipbonusenergyneutoptimalaf2.py
index 39609d68be..f85f88f75a 100644
--- a/eos/effects/shipbonusenergyneutoptimalaf2.py
+++ b/eos/effects/shipbonusenergyneutoptimalaf2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergyneutoptimaleaf1.py b/eos/effects/shipbonusenergyneutoptimaleaf1.py
index 29645d514a..f78e0b1eae 100644
--- a/eos/effects/shipbonusenergyneutoptimaleaf1.py
+++ b/eos/effects/shipbonusenergyneutoptimaleaf1.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalrs1.py b/eos/effects/shipbonusenergyneutoptimalrs1.py
index e045b53eb9..f6141a9673 100644
--- a/eos/effects/shipbonusenergyneutoptimalrs1.py
+++ b/eos/effects/shipbonusenergyneutoptimalrs1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Curse
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutoptimalrs3.py b/eos/effects/shipbonusenergyneutoptimalrs3.py
index e71d9d93df..9f7dab0640 100644
--- a/eos/effects/shipbonusenergyneutoptimalrs3.py
+++ b/eos/effects/shipbonusenergyneutoptimalrs3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosfalloffab2.py b/eos/effects/shipbonusenergynosfalloffab2.py
index 4fd3d877e1..153506b06d 100644
--- a/eos/effects/shipbonusenergynosfalloffab2.py
+++ b/eos/effects/shipbonusenergynosfalloffab2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergynosfalloffac3.py b/eos/effects/shipbonusenergynosfalloffac3.py
index e2099faf45..5bc01aab77 100644
--- a/eos/effects/shipbonusenergynosfalloffac3.py
+++ b/eos/effects/shipbonusenergynosfalloffac3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergynosfalloffad1.py b/eos/effects/shipbonusenergynosfalloffad1.py
index 466f0f5873..1de9dcb6fc 100644
--- a/eos/effects/shipbonusenergynosfalloffad1.py
+++ b/eos/effects/shipbonusenergynosfalloffad1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dragoon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergynosfalloffaf3.py b/eos/effects/shipbonusenergynosfalloffaf3.py
index 30837fc681..9316fbb760 100644
--- a/eos/effects/shipbonusenergynosfalloffaf3.py
+++ b/eos/effects/shipbonusenergynosfalloffaf3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergynosfalloffeaf3.py b/eos/effects/shipbonusenergynosfalloffeaf3.py
index fddede98ed..74f6b4ceb2 100644
--- a/eos/effects/shipbonusenergynosfalloffeaf3.py
+++ b/eos/effects/shipbonusenergynosfalloffeaf3.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergynosfalloffrs2.py b/eos/effects/shipbonusenergynosfalloffrs2.py
index 448e9f26e1..372b2f1c3b 100644
--- a/eos/effects/shipbonusenergynosfalloffrs2.py
+++ b/eos/effects/shipbonusenergynosfalloffrs2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosfalloffrs3.py b/eos/effects/shipbonusenergynosfalloffrs3.py
index 2cc7313b96..d02b92b952 100644
--- a/eos/effects/shipbonusenergynosfalloffrs3.py
+++ b/eos/effects/shipbonusenergynosfalloffrs3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Curse
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalab.py b/eos/effects/shipbonusenergynosoptimalab.py
index 07acffc226..a3075262c9 100644
--- a/eos/effects/shipbonusenergynosoptimalab.py
+++ b/eos/effects/shipbonusenergynosoptimalab.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Armageddon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergynosoptimalac1.py b/eos/effects/shipbonusenergynosoptimalac1.py
index ce1d7d17e5..d2c101bbd9 100644
--- a/eos/effects/shipbonusenergynosoptimalac1.py
+++ b/eos/effects/shipbonusenergynosoptimalac1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusenergynosoptimalad2.py b/eos/effects/shipbonusenergynosoptimalad2.py
index a21ba98b9d..7d7e516b82 100644
--- a/eos/effects/shipbonusenergynosoptimalad2.py
+++ b/eos/effects/shipbonusenergynosoptimalad2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Dragoon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergynosoptimalaf2.py b/eos/effects/shipbonusenergynosoptimalaf2.py
index c7b5ca6365..4b6adf6f8e 100644
--- a/eos/effects/shipbonusenergynosoptimalaf2.py
+++ b/eos/effects/shipbonusenergynosoptimalaf2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusenergynosoptimaleaf1.py b/eos/effects/shipbonusenergynosoptimaleaf1.py
index 2874e596ea..0de8a02d85 100644
--- a/eos/effects/shipbonusenergynosoptimaleaf1.py
+++ b/eos/effects/shipbonusenergynosoptimaleaf1.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
+                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalrs1.py b/eos/effects/shipbonusenergynosoptimalrs1.py
index 9755223eda..8eaf6c305f 100644
--- a/eos/effects/shipbonusenergynosoptimalrs1.py
+++ b/eos/effects/shipbonusenergynosoptimalrs1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Curse
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergynosoptimalrs3.py b/eos/effects/shipbonusenergynosoptimalrs3.py
index 8f9da2fcff..670f0c7013 100644
--- a/eos/effects/shipbonusenergynosoptimalrs3.py
+++ b/eos/effects/shipbonusenergynosoptimalrs3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pilgrim
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyvampirerangead2.py b/eos/effects/shipbonusenergyvampirerangead2.py
index 5739edcbcf..28f9f7c8cf 100644
--- a/eos/effects/shipbonusenergyvampirerangead2.py
+++ b/eos/effects/shipbonusenergyvampirerangead2.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py b/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py
index bd37ce7433..0152e33bd0 100644
--- a/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py
+++ b/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Celestis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py
index 7c7d1c512a..7d1afd2ed3 100644
--- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py
+++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Celestis (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
+                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
index e321d8f41a..bbfd54a57e 100644
--- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
+++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py
@@ -4,6 +4,9 @@
 # Ship: Keres
 # Ship: Maulus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2"),
+                                  skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py
index 90874e57f1..82fb262889 100644
--- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py
+++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
                                   "maxTargetRangeBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py b/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py
index 677cc11695..2c87e50e96 100644
--- a/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py
+++ b/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Celestis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py
index 7c676b1801..b8b1259dce 100644
--- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py
+++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Celestis (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
+                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
index 3a1da82945..ede9c9d7ec 100644
--- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
+++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py
@@ -4,6 +4,9 @@
 # Ship: Keres
 # Ship: Maulus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2"),
+                                  skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py
index fdf1f57ccb..6cc41c30dd 100644
--- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py
+++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
                                   "scanResolutionBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py
index f047f203dc..03e07fbdbb 100644
--- a/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py
+++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Impairor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "maxRangeBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus"))
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthac1.py b/eos/effects/shipbonusewweapondisruptionstrengthac1.py
index 5d8b490e75..6ac7ea077a 100644
--- a/eos/effects/shipbonusewweapondisruptionstrengthac1.py
+++ b/eos/effects/shipbonusewweapondisruptionstrengthac1.py
@@ -3,11 +3,20 @@
 # Used by:
 # Variations of ship: Arbitrator (3 of 3)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
index 61a417430a..d7955172bf 100644
--- a/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
+++ b/eos/effects/shipbonusewweapondisruptionstrengthaf2.py
@@ -3,11 +3,20 @@
 # Used by:
 # Variations of ship: Crucifier (3 of 3)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
+                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusexplosivearmorresistancead2.py b/eos/effects/shipbonusexplosivearmorresistancead2.py
index b9cf16401e..a1e2cc1c84 100644
--- a/eos/effects/shipbonusexplosivearmorresistancead2.py
+++ b/eos/effects/shipbonusexplosivearmorresistancead2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pontifex
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
+                           skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusexplosivearmorresistancegd2.py b/eos/effects/shipbonusexplosivearmorresistancegd2.py
index 9954b848b2..37c731132d 100644
--- a/eos/effects/shipbonusexplosivearmorresistancegd2.py
+++ b/eos/effects/shipbonusexplosivearmorresistancegd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Magus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
+                           skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusexplosivemissiledamagecd1.py b/eos/effects/shipbonusexplosivemissiledamagecd1.py
index dab14bcd96..b7c2293f7e 100644
--- a/eos/effects/shipbonusexplosivemissiledamagecd1.py
+++ b/eos/effects/shipbonusexplosivemissiledamagecd1.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"),
+                                    skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusexplosivemissiledmgmd1.py b/eos/effects/shipbonusexplosivemissiledmgmd1.py
index 4b6852d70e..b6b2dd692b 100644
--- a/eos/effects/shipbonusexplosivemissiledmgmd1.py
+++ b/eos/effects/shipbonusexplosivemissiledmgmd1.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"),
+                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
index 7932112ccd..77f1f03562 100644
--- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
@@ -5,5 +5,8 @@
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
+                           skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusexplosiveshieldresistancemd2.py b/eos/effects/shipbonusexplosiveshieldresistancemd2.py
index 3cd1b0b2cd..b9f93788b0 100644
--- a/eos/effects/shipbonusexplosiveshieldresistancemd2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancemd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
+                           skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py b/eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py
index ef38862e57..2ae2102d62 100644
--- a/eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py
+++ b/eos/effects/shipbonusforceauxiliarya1remoterepairandcapamount.py
@@ -3,10 +3,14 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
                                               mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
+                                  skill="Amarr Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
                                               mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
+                                  skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarya2armorresists.py b/eos/effects/shipbonusforceauxiliarya2armorresists.py
index 071d511844..38dc7efd98 100644
--- a/eos/effects/shipbonusforceauxiliarya2armorresists.py
+++ b/eos/effects/shipbonusforceauxiliarya2armorresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"), skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
+                           skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarya3capcapacity.py b/eos/effects/shipbonusforceauxiliarya3capcapacity.py
index 8ee87d8789..604573a392 100644
--- a/eos/effects/shipbonusforceauxiliarya3capcapacity.py
+++ b/eos/effects/shipbonusforceauxiliarya3capcapacity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryA3"), skill="Amarr Carrier")
+    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryA3"),
+                           skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py b/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
index ed7b9cf3d8..555b8f3366 100644
--- a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py b/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
index 0aaf8c8a98..2a6cdced9e 100644
--- a/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
+++ b/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
@@ -3,10 +3,14 @@
 # Used by:
 # Ship: Minokawa
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
                                               mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"), skill="Caldari Carrier")
+                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
+                                  skill="Caldari Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
                                               mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"), skill="Caldari Carrier")
+                                  "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
+                                  skill="Caldari Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryc2shieldresists.py b/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
index 96cfae084e..9381d82df1 100644
--- a/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
+++ b/eos/effects/shipbonusforceauxiliaryc2shieldresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Minokawa
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"), skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
+                           skill="Caldari Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryc3capcapacity.py b/eos/effects/shipbonusforceauxiliaryc3capcapacity.py
index 3e1cf41d47..e7ed1f5de2 100644
--- a/eos/effects/shipbonusforceauxiliaryc3capcapacity.py
+++ b/eos/effects/shipbonusforceauxiliaryc3capcapacity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Minokawa
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryC3"), skill="Caldari Carrier")
+    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("shipBonusForceAuxiliaryC3"),
+                           skill="Caldari Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py b/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
index d724e8bdaf..a149737532 100644
--- a/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Minokawa
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryg1remotecycletime.py b/eos/effects/shipbonusforceauxiliaryg1remotecycletime.py
index eb889bf5d1..3ae370e415 100644
--- a/eos/effects/shipbonusforceauxiliaryg1remotecycletime.py
+++ b/eos/effects/shipbonusforceauxiliaryg1remotecycletime.py
@@ -3,10 +3,14 @@
 # Used by:
 # Ship: Ninazu
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
                                               mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")
+                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
+                                  skill="Gallente Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
                                               mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")
+                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
+                                  skill="Gallente Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryg2localrepairamount.py b/eos/effects/shipbonusforceauxiliaryg2localrepairamount.py
index b93057e97b..bdbefdd498 100644
--- a/eos/effects/shipbonusforceauxiliaryg2localrepairamount.py
+++ b/eos/effects/shipbonusforceauxiliaryg2localrepairamount.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Ninazu
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "armorDamageAmount",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py b/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py
index dffacb74ae..7dbd8b3928 100644
--- a/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py
+++ b/eos/effects/shipbonusforceauxiliaryg3capboosterstrength.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Ninazu
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG3"), skill="Gallente Carrier")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus",
+                                    src.getModifiedItemAttr("shipBonusForceAuxiliaryG3"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py b/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
index 5e933d9a57..f67bdd8fda 100644
--- a/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Ninazu
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym1remotecycletime.py b/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
index 90f14c9522..9ab5ae04cb 100644
--- a/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
+++ b/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
@@ -3,11 +3,15 @@
 # Used by:
 # Ship: Lif
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
                                               mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
+                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
+                                  skill="Minmatar Carrier")
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
                                               mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
+                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
+                                  skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym2localboostamount.py b/eos/effects/shipbonusforceauxiliarym2localboostamount.py
index 8fe11a235d..2bff2d7947 100644
--- a/eos/effects/shipbonusforceauxiliarym2localboostamount.py
+++ b/eos/effects/shipbonusforceauxiliarym2localboostamount.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Lif
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py b/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py
index 401b0530fb..a2a656cea1 100644
--- a/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py
+++ b/eos/effects/shipbonusforceauxiliarym3capboosterstrength.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Lif
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM3"), skill="Minmatar Carrier")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Capacitor Booster Charge", "capacitorBonus",
+                                    src.getModifiedItemAttr("shipBonusForceAuxiliaryM3"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py b/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
index afbb2c09a2..53c1f8b60f 100644
--- a/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Lif
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py b/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
index 41f57ed822..cda897b726 100644
--- a/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
+++ b/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Force Auxiliary (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu", src.getModifiedItemAttr("shipBonusRole1"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu",
+                                  src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py b/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
index a401ef2a0e..53bb50f5ff 100644
--- a/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
+++ b/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
@@ -3,7 +3,12 @@
 # Used by:
 # Ships from group: Force Auxiliary (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "structureDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "shieldBonus", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "structureDamageAmount",
+                                 src.getModifiedItemAttr("shipBonusRole2"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "armorDamageAmount",
+                                 src.getModifiedItemAttr("shipBonusRole2"))
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "shieldBonus",
+                                 src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py b/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
index b44ffb8f04..69a19a64b9 100644
--- a/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
+++ b/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Force Auxiliary (4 of 4)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole3"))
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
+                                     src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py b/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py
index d27d304937..28ce0aedbf 100644
--- a/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py
+++ b/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Talwar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
+                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py b/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py
index b1be299087..efb861fb98 100644
--- a/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py
+++ b/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Corax
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
+                                    skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusgf1torpedoflighttime.py b/eos/effects/shipbonusgf1torpedoflighttime.py
index 9ed770b3bc..7fe141ec6a 100644
--- a/eos/effects/shipbonusgf1torpedoflighttime.py
+++ b/eos/effects/shipbonusgf1torpedoflighttime.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nemesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "explosionDelay", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusgftorpedoexplosionvelocity.py b/eos/effects/shipbonusgftorpedoexplosionvelocity.py
index b653c749ec..d7cd8a67e5 100644
--- a/eos/effects/shipbonusgftorpedoexplosionvelocity.py
+++ b/eos/effects/shipbonusgftorpedoexplosionvelocity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nemesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
\ No newline at end of file
+                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py
index 0b529bf001..59e5465432 100644
--- a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py
+++ b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/shipbonusheatdamageatf1.py b/eos/effects/shipbonusheatdamageatf1.py
index 22f686d748..d6dfc2597c 100644
--- a/eos/effects/shipbonusheatdamageatf1.py
+++ b/eos/effects/shipbonusheatdamageatf1.py
@@ -5,6 +5,8 @@
 # Ship: Etana
 # Ship: Utu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
                                   ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py b/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py
index 4e0334dd1b..12e3673b4d 100644
--- a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py
+++ b/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py
@@ -4,7 +4,10 @@
 # Ship: Rapier
 # Ship: Scythe Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "explosive", "kinetic", "thermal"):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
+                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py
index 425b3024e9..4843ac63b4 100644
--- a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py
+++ b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py
@@ -4,6 +4,9 @@
 # Ship: Drake
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
+                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
index dbae3e20f9..85820f30ec 100644
--- a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
+++ b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Cyclone (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
                                   "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonusheavydronearmorhpgc2.py b/eos/effects/shipbonusheavydronearmorhpgc2.py
index 5f9a3e2adf..296ebfce86 100644
--- a/eos/effects/shipbonusheavydronearmorhpgc2.py
+++ b/eos/effects/shipbonusheavydronearmorhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavydronearmorhppiratefaction.py b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
index d1d7189f5e..c5dc193aba 100644
--- a/eos/effects/shipbonusheavydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusheavydronedamagemultipliergc2.py b/eos/effects/shipbonusheavydronedamagemultipliergc2.py
index 3932beba39..f144bd6983 100644
--- a/eos/effects/shipbonusheavydronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusheavydronedamagemultipliergc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
index b6f76821df..b1a03b0f43 100644
--- a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusheavydronehpgc2.py b/eos/effects/shipbonusheavydronehpgc2.py
index 64ef5aea27..8ddebf2516 100644
--- a/eos/effects/shipbonusheavydronehpgc2.py
+++ b/eos/effects/shipbonusheavydronehpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavydronehppiratefaction.py b/eos/effects/shipbonusheavydronehppiratefaction.py
index 18e1425071..58a3c7eb47 100644
--- a/eos/effects/shipbonusheavydronehppiratefaction.py
+++ b/eos/effects/shipbonusheavydronehppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusheavydroneshieldhpgc2.py b/eos/effects/shipbonusheavydroneshieldhpgc2.py
index e3155d4d8f..82e112d198 100644
--- a/eos/effects/shipbonusheavydroneshieldhpgc2.py
+++ b/eos/effects/shipbonusheavydroneshieldhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
index 6541975058..60d10086fb 100644
--- a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusheavydronespeedgc.py b/eos/effects/shipbonusheavydronespeedgc.py
index f318379624..4f71132180 100644
--- a/eos/effects/shipbonusheavydronespeedgc.py
+++ b/eos/effects/shipbonusheavydronespeedgc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavydronetrackinggc.py b/eos/effects/shipbonusheavydronetrackinggc.py
index aac4f04225..d306134b2d 100644
--- a/eos/effects/shipbonusheavydronetrackinggc.py
+++ b/eos/effects/shipbonusheavydronetrackinggc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusheavymissilealldamagemc2.py b/eos/effects/shipbonusheavymissilealldamagemc2.py
index b4b1fbb039..cd0e38e602 100644
--- a/eos/effects/shipbonusheavymissilealldamagemc2.py
+++ b/eos/effects/shipbonusheavymissilealldamagemc2.py
@@ -4,7 +4,10 @@
 # Ship: Rapier
 # Ship: Scythe Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "explosive", "kinetic", "thermal"):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
+                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusheavymissileemdmgmb.py b/eos/effects/shipbonusheavymissileemdmgmb.py
index 6055232bfc..18cc901a93 100644
--- a/eos/effects/shipbonusheavymissileemdmgmb.py
+++ b/eos/effects/shipbonusheavymissileemdmgmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusheavymissileexplodmgmb.py b/eos/effects/shipbonusheavymissileexplodmgmb.py
index a191d1f46b..917596584d 100644
--- a/eos/effects/shipbonusheavymissileexplodmgmb.py
+++ b/eos/effects/shipbonusheavymissileexplodmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py
index 37d20993f7..83f5919800 100644
--- a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py
+++ b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py
@@ -4,6 +4,9 @@
 # Ship: Drake
 # Ship: Nighthawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
+                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipbonusheavymissilekineticdmgmb.py b/eos/effects/shipbonusheavymissilekineticdmgmb.py
index 507fe97e88..5e2f0da29c 100644
--- a/eos/effects/shipbonusheavymissilekineticdmgmb.py
+++ b/eos/effects/shipbonusheavymissilekineticdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
index 41d41d1db8..7622c3d1da 100644
--- a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
+++ b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Cyclone (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
                                   "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonusheavymissilethermdmgmb.py b/eos/effects/shipbonusheavymissilethermdmgmb.py
index 3059a0b343..d4406c6b62 100644
--- a/eos/effects/shipbonusheavymissilethermdmgmb.py
+++ b/eos/effects/shipbonusheavymissilethermdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonushmlemdamageac.py b/eos/effects/shipbonushmlemdamageac.py
index 73e0215ab0..464e8d6ac5 100644
--- a/eos/effects/shipbonushmlemdamageac.py
+++ b/eos/effects/shipbonushmlemdamageac.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonushmlexplodamageac.py b/eos/effects/shipbonushmlexplodamageac.py
index aae93767b5..c22b7f6bae 100644
--- a/eos/effects/shipbonushmlexplodamageac.py
+++ b/eos/effects/shipbonushmlexplodamageac.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonushmlkineticdamageac.py b/eos/effects/shipbonushmlkineticdamageac.py
index e5caa6f6b7..adecc7914d 100644
--- a/eos/effects/shipbonushmlkineticdamageac.py
+++ b/eos/effects/shipbonushmlkineticdamageac.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonushmlthermdamageac.py b/eos/effects/shipbonushmlthermdamageac.py
index 0951cbcb2f..663ee7a44d 100644
--- a/eos/effects/shipbonushmlthermdamageac.py
+++ b/eos/effects/shipbonushmlthermdamageac.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py
index 0e77373b22..1275a2e995 100644
--- a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py
+++ b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers")
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
+                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/shipbonushtfalloffgb2.py b/eos/effects/shipbonushtfalloffgb2.py
index b359b64d8b..f8a66395d7 100644
--- a/eos/effects/shipbonushtfalloffgb2.py
+++ b/eos/effects/shipbonushtfalloffgb2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Kronos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
diff --git a/eos/effects/shipbonushybridfalloffatc2.py b/eos/effects/shipbonushybridfalloffatc2.py
index 7c0a32e788..b60d60618e 100644
--- a/eos/effects/shipbonushybridfalloffatc2.py
+++ b/eos/effects/shipbonushybridfalloffatc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Adrestia
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/shipbonushybridoptimalcb.py b/eos/effects/shipbonushybridoptimalcb.py
index b94cde8d24..5129958e9b 100644
--- a/eos/effects/shipbonushybridoptimalcb.py
+++ b/eos/effects/shipbonushybridoptimalcb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rokh
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipbonushybridtrackingatc2.py b/eos/effects/shipbonushybridtrackingatc2.py
index ee8aeda5b0..9b6e8a4ec7 100644
--- a/eos/effects/shipbonushybridtrackingatc2.py
+++ b/eos/effects/shipbonushybridtrackingatc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Adrestia
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py
index 2f3cb4e100..dabf163d65 100644
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -5,6 +5,8 @@
 # Ship: Federation Navy Comet
 # Ship: Tristan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                    "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusiceharvesterdurationore3.py b/eos/effects/shipbonusiceharvesterdurationore3.py
index f984510d0a..2e099cc240 100644
--- a/eos/effects/shipbonusiceharvesterdurationore3.py
+++ b/eos/effects/shipbonusiceharvesterdurationore3.py
@@ -4,6 +4,8 @@
 # Ships from group: Exhumer (3 of 3)
 # Ships from group: Mining Barge (3 of 3)
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", container.getModifiedItemAttr("shipBonusORE3"), skill=("Mining Barge"))
\ No newline at end of file
+                                  "duration", container.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/shipbonusjustscramblerrangegf2.py b/eos/effects/shipbonusjustscramblerrangegf2.py
index e620633f2a..0c82717b26 100644
--- a/eos/effects/shipbonusjustscramblerrangegf2.py
+++ b/eos/effects/shipbonusjustscramblerrangegf2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Maulus Navy Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange", src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange",
+                                  src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonuskineticarmorresistancead2.py b/eos/effects/shipbonuskineticarmorresistancead2.py
index f326f664cf..2359565c03 100644
--- a/eos/effects/shipbonuskineticarmorresistancead2.py
+++ b/eos/effects/shipbonuskineticarmorresistancead2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pontifex
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
+                           skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonuskineticarmorresistancegd2.py b/eos/effects/shipbonuskineticarmorresistancegd2.py
index fc46a2b171..48b4afc6aa 100644
--- a/eos/effects/shipbonuskineticarmorresistancegd2.py
+++ b/eos/effects/shipbonuskineticarmorresistancegd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Magus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
+                           skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonuskineticmissiledamagecd1.py b/eos/effects/shipbonuskineticmissiledamagecd1.py
index fccd0aa380..3f47a32e24 100644
--- a/eos/effects/shipbonuskineticmissiledamagecd1.py
+++ b/eos/effects/shipbonuskineticmissiledamagecd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonuskineticmissiledamagegb2.py b/eos/effects/shipbonuskineticmissiledamagegb2.py
index 5c47215ddc..203f8ff3c6 100644
--- a/eos/effects/shipbonuskineticmissiledamagegb2.py
+++ b/eos/effects/shipbonuskineticmissiledamagegb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2"),
+                                    skill="Gallente Battleship")
diff --git a/eos/effects/shipbonuskineticmissiledamagegc2.py b/eos/effects/shipbonuskineticmissiledamagegc2.py
index 21a2ab9980..b4f538d2ca 100644
--- a/eos/effects/shipbonuskineticmissiledamagegc2.py
+++ b/eos/effects/shipbonuskineticmissiledamagegc2.py
@@ -4,6 +4,8 @@
 # Ship: Chameleon
 # Ship: Gila
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuskineticmissiledamagegf.py b/eos/effects/shipbonuskineticmissiledamagegf.py
index 2b52b828a9..8bd18e45a9 100644
--- a/eos/effects/shipbonuskineticmissiledamagegf.py
+++ b/eos/effects/shipbonuskineticmissiledamagegf.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonuskineticmissiledmgmd1.py b/eos/effects/shipbonuskineticmissiledmgmd1.py
index 881fa755c1..ece38cb4eb 100644
--- a/eos/effects/shipbonuskineticmissiledmgmd1.py
+++ b/eos/effects/shipbonuskineticmissiledmgmd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py
index 00da5e4d76..9fb1f3929a 100644
--- a/eos/effects/shipbonuskineticshieldresistancecb2.py
+++ b/eos/effects/shipbonuskineticshieldresistancecb2.py
@@ -5,5 +5,8 @@
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
+                           skill="Caldari Battleship")
diff --git a/eos/effects/shipbonuskineticshieldresistancemd2.py b/eos/effects/shipbonuskineticshieldresistancemd2.py
index fe8ba6db5b..81c08cc47f 100644
--- a/eos/effects/shipbonuskineticshieldresistancemd2.py
+++ b/eos/effects/shipbonuskineticshieldresistancemd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
+                           skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
index 1d392745aa..7f5cd2822a 100644
--- a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
+++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Paladin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
index 6505715091..cad976ce7d 100644
--- a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
+++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py
@@ -4,6 +4,8 @@
 # Ship: Apocalypse
 # Ship: Apocalypse Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/shipbonuslargeenergyturrettrackingab.py
index 1dc6274492..0ec7b3b4c0 100644
--- a/eos/effects/shipbonuslargeenergyturrettrackingab.py
+++ b/eos/effects/shipbonuslargeenergyturrettrackingab.py
@@ -4,6 +4,8 @@
 # Ship: Apocalypse
 # Ship: Apocalypse Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/shipbonuslargeenergyweapondamageab2.py
index af3e9d8eae..a982bdf365 100644
--- a/eos/effects/shipbonuslargeenergyweapondamageab2.py
+++ b/eos/effects/shipbonuslargeenergyweapondamageab2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Abaddon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2"),
+                                  skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusletoptimalrangepiratefaction.py b/eos/effects/shipbonusletoptimalrangepiratefaction.py
index b0d80376b1..d2f044b5f1 100644
--- a/eos/effects/shipbonusletoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusletoptimalrangepiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdronearmorhpgc2.py b/eos/effects/shipbonuslightdronearmorhpgc2.py
index b3db8ca7f7..244594dd1d 100644
--- a/eos/effects/shipbonuslightdronearmorhpgc2.py
+++ b/eos/effects/shipbonuslightdronearmorhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
\ No newline at end of file
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuslightdronearmorhppiratefaction.py b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
index 5294759269..aaefc81192 100644
--- a/eos/effects/shipbonuslightdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdronedamagemultipliergc2.py b/eos/effects/shipbonuslightdronedamagemultipliergc2.py
index f06eb81d39..c25e35e5de 100644
--- a/eos/effects/shipbonuslightdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonuslightdronedamagemultipliergc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
index f6163a2461..e5a9b340c3 100644
--- a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdronehpgc2.py b/eos/effects/shipbonuslightdronehpgc2.py
index ec66ebcc8a..886f429a5f 100644
--- a/eos/effects/shipbonuslightdronehpgc2.py
+++ b/eos/effects/shipbonuslightdronehpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuslightdronehppiratefaction.py b/eos/effects/shipbonuslightdronehppiratefaction.py
index a4faf9bdd1..af6b5dae40 100644
--- a/eos/effects/shipbonuslightdronehppiratefaction.py
+++ b/eos/effects/shipbonuslightdronehppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightdroneshieldhpgc2.py b/eos/effects/shipbonuslightdroneshieldhpgc2.py
index b46703c5b5..5cead50c6b 100644
--- a/eos/effects/shipbonuslightdroneshieldhpgc2.py
+++ b/eos/effects/shipbonuslightdroneshieldhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
index 8648a27677..8bbff53f26 100644
--- a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuslightmissilealldamagemc2.py b/eos/effects/shipbonuslightmissilealldamagemc2.py
index 1f12783b5a..c00eb39398 100644
--- a/eos/effects/shipbonuslightmissilealldamagemc2.py
+++ b/eos/effects/shipbonuslightmissilealldamagemc2.py
@@ -4,7 +4,10 @@
 # Ship: Rapier
 # Ship: Scythe Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "explosive", "kinetic", "thermal"):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
+                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusmediumdronearmorhpgc2.py b/eos/effects/shipbonusmediumdronearmorhpgc2.py
index 609e5dfbd9..d3237a25b4 100644
--- a/eos/effects/shipbonusmediumdronearmorhpgc2.py
+++ b/eos/effects/shipbonusmediumdronearmorhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
index b0afc2751b..e48c993198 100644
--- a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Chameleon
 # Ship: Gila
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmediumdronedamagemultipliergc2.py b/eos/effects/shipbonusmediumdronedamagemultipliergc2.py
index 871ec5da92..df28d53e07 100644
--- a/eos/effects/shipbonusmediumdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusmediumdronedamagemultipliergc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
index 45a647b406..6adbcb51b5 100644
--- a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Chameleon
 # Ship: Gila
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmediumdronehpgc2.py b/eos/effects/shipbonusmediumdronehpgc2.py
index 376f835a38..719b2b507c 100644
--- a/eos/effects/shipbonusmediumdronehpgc2.py
+++ b/eos/effects/shipbonusmediumdronehpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusmediumdronehppiratefaction.py b/eos/effects/shipbonusmediumdronehppiratefaction.py
index 4c57126a54..287bd32add 100644
--- a/eos/effects/shipbonusmediumdronehppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronehppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Chameleon
 # Ship: Gila
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmediumdroneshieldhpgc2.py b/eos/effects/shipbonusmediumdroneshieldhpgc2.py
index a076da9011..3e2e484097 100644
--- a/eos/effects/shipbonusmediumdroneshieldhpgc2.py
+++ b/eos/effects/shipbonusmediumdroneshieldhpgc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
index ea15603ab5..eb68ee3fb6 100644
--- a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
@@ -4,6 +4,8 @@
 # Ship: Chameleon
 # Ship: Gila
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py b/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
index a02db87301..428e548a02 100644
--- a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
@@ -6,6 +6,8 @@
 # Ship: Gnosis
 # Ship: Phantasm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmediumenergyturrettrackingac2.py b/eos/effects/shipbonusmediumenergyturrettrackingac2.py
index 1222bb4068..d0c9a8e55e 100644
--- a/eos/effects/shipbonusmediumenergyturrettrackingac2.py
+++ b/eos/effects/shipbonusmediumenergyturrettrackingac2.py
@@ -4,6 +4,8 @@
 # Ship: Fiend
 # Ship: Phantasm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusmediumhybriddmgcc2.py b/eos/effects/shipbonusmediumhybriddmgcc2.py
index ac1b0a5660..858d70ab97 100644
--- a/eos/effects/shipbonusmediumhybriddmgcc2.py
+++ b/eos/effects/shipbonusmediumhybriddmgcc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Falcon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusmetoptimalac2.py b/eos/effects/shipbonusmetoptimalac2.py
index 18a09ba848..50d9ce4a45 100644
--- a/eos/effects/shipbonusmetoptimalac2.py
+++ b/eos/effects/shipbonusmetoptimalac2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Omen Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusmetoptimalrangepiratefaction.py b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
index 76d57deac3..5380edc07f 100644
--- a/eos/effects/shipbonusmetoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Stratios (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py b/eos/effects/shipbonusmf1torpedoexplosionvelocity.py
index 4ae858dfa3..db283c8bd2 100644
--- a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py
+++ b/eos/effects/shipbonusmf1torpedoexplosionvelocity.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hound
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
\ No newline at end of file
+                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusmf1torpedoflighttime.py b/eos/effects/shipbonusmf1torpedoflighttime.py
index 10b8500fee..97c7906945 100644
--- a/eos/effects/shipbonusmf1torpedoflighttime.py
+++ b/eos/effects/shipbonusmf1torpedoflighttime.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hound
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "explosionDelay", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusmineralbaygi2.py b/eos/effects/shipbonusmineralbaygi2.py
index 7ac219899b..66a78e721d 100644
--- a/eos/effects/shipbonusmineralbaygi2.py
+++ b/eos/effects/shipbonusmineralbaygi2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Kryos
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
+    fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
+                           skill="Gallente Industrial")
diff --git a/eos/effects/shipbonusminingdroneamountpercentrookie.py b/eos/effects/shipbonusminingdroneamountpercentrookie.py
index 00484e8e55..ddffa24e9f 100644
--- a/eos/effects/shipbonusminingdroneamountpercentrookie.py
+++ b/eos/effects/shipbonusminingdroneamountpercentrookie.py
@@ -5,6 +5,8 @@
 # Ship: Taipan
 # Ship: Velator
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone",
diff --git a/eos/effects/shipbonusminingdurationore3.py b/eos/effects/shipbonusminingdurationore3.py
index b2c69f664a..4f65512310 100644
--- a/eos/effects/shipbonusminingdurationore3.py
+++ b/eos/effects/shipbonusminingdurationore3.py
@@ -4,6 +4,8 @@
 # Ships from group: Exhumer (3 of 3)
 # Ships from group: Mining Barge (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusORE3"), skill=("Mining Barge"))
+                                  "duration", ship.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/shipbonusminingiceharvestingrangeore2.py b/eos/effects/shipbonusminingiceharvestingrangeore2.py
index 288aeb4e4c..d29154f31e 100644
--- a/eos/effects/shipbonusminingiceharvestingrangeore2.py
+++ b/eos/effects/shipbonusminingiceharvestingrangeore2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Covetor (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge"))
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
+        "maxRange", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/shipbonusmissileaoevelocitymb2.py b/eos/effects/shipbonusmissileaoevelocitymb2.py
index ba5e38e0c8..844746ae1d 100644
--- a/eos/effects/shipbonusmissileaoevelocitymb2.py
+++ b/eos/effects/shipbonusmissileaoevelocitymb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship")
+                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py b/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py
index afc0322209..e1976dc496 100644
--- a/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py
+++ b/eos/effects/shipbonusmissileexplosiondelaypiratefaction2.py
@@ -5,6 +5,8 @@
 # Ship: Garmur
 # Ship: Orthrus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "explosionDelay", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
diff --git a/eos/effects/shipbonusmissilekineticlatf2.py b/eos/effects/shipbonusmissilekineticlatf2.py
index c3192529d7..c07b02c44f 100644
--- a/eos/effects/shipbonusmissilekineticlatf2.py
+++ b/eos/effects/shipbonusmissilekineticlatf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cambion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipbonusmissilelauncherassaultrofatc1.py b/eos/effects/shipbonusmissilelauncherassaultrofatc1.py
index 0df09a4ec9..cc18bb8ed8 100644
--- a/eos/effects/shipbonusmissilelauncherassaultrofatc1.py
+++ b/eos/effects/shipbonusmissilelauncherassaultrofatc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
                                   "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py b/eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py
index f5f8512351..ae3dc443d6 100644
--- a/eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py
+++ b/eos/effects/shipbonusmissilelauncherheavyassaultrofatc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
                                   "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/shipbonusmissilelauncherheavyrofatc1.py b/eos/effects/shipbonusmissilelauncherheavyrofatc1.py
index 16764ceb54..bf2b11b02b 100644
--- a/eos/effects/shipbonusmissilelauncherheavyrofatc1.py
+++ b/eos/effects/shipbonusmissilelauncherheavyrofatc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
                                   "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/shipbonusmissilevelocityad2.py b/eos/effects/shipbonusmissilevelocityad2.py
index e498e22313..af169f934f 100644
--- a/eos/effects/shipbonusmissilevelocityad2.py
+++ b/eos/effects/shipbonusmissilevelocityad2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Heretic
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusmissilevelocitycc2.py b/eos/effects/shipbonusmissilevelocitycc2.py
index 1886163f50..991b62c449 100644
--- a/eos/effects/shipbonusmissilevelocitycc2.py
+++ b/eos/effects/shipbonusmissilevelocitycc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cerberus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusmwdsignatureradiusmd2.py b/eos/effects/shipbonusmwdsignatureradiusmd2.py
index 5d3ba376ee..2354f22a1e 100644
--- a/eos/effects/shipbonusmwdsignatureradiusmd2.py
+++ b/eos/effects/shipbonusmwdsignatureradiusmd2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Talwar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
+                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2"),
+                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusnoctissalvagecycle.py b/eos/effects/shipbonusnoctissalvagecycle.py
index dd2780d33b..5b405a3714 100644
--- a/eos/effects/shipbonusnoctissalvagecycle.py
+++ b/eos/effects/shipbonusnoctissalvagecycle.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Noctis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"), skill="ORE Industrial")
+                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
+                                  skill="ORE Industrial")
diff --git a/eos/effects/shipbonusnoctistractorcycle.py b/eos/effects/shipbonusnoctistractorcycle.py
index 8543ccf069..b9ea733b9d 100644
--- a/eos/effects/shipbonusnoctistractorcycle.py
+++ b/eos/effects/shipbonusnoctistractorcycle.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Noctis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"), skill="ORE Industrial")
+                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
+                                  skill="ORE Industrial")
diff --git a/eos/effects/shipbonusnoctistractorrange.py b/eos/effects/shipbonusnoctistractorrange.py
index 58a8799e08..ab22543451 100644
--- a/eos/effects/shipbonusnoctistractorrange.py
+++ b/eos/effects/shipbonusnoctistractorrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Noctis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2"), skill="ORE Industrial")
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
+                                  skill="ORE Industrial")
diff --git a/eos/effects/shipbonusnoctistractorvelocity.py b/eos/effects/shipbonusnoctistractorvelocity.py
index bf7030612f..28c2f237a4 100644
--- a/eos/effects/shipbonusnoctistractorvelocity.py
+++ b/eos/effects/shipbonusnoctistractorvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Noctis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2"), skill="ORE Industrial")
+                                  "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
+                                  skill="ORE Industrial")
diff --git a/eos/effects/shipbonusorecapacitygi2.py b/eos/effects/shipbonusorecapacitygi2.py
index b73c405892..5c6af2abb7 100644
--- a/eos/effects/shipbonusorecapacitygi2.py
+++ b/eos/effects/shipbonusorecapacitygi2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Miasmos
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
+    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
+                           skill="Gallente Industrial")
diff --git a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py
index c97e7f30f1..3027e47a25 100644
--- a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py
+++ b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusORECapital4"), skill="Capital Industrial Ships")
+                                     type, ship.getModifiedItemAttr("shipBonusORECapital4"),
+                                     skill="Capital Industrial Ships")
diff --git a/eos/effects/shipbonusorecapshipdronedmgbonus.py b/eos/effects/shipbonusorecapshipdronedmgbonus.py
index 5dce4fd887..cb56c23261 100644
--- a/eos/effects/shipbonusorecapshipdronedmgbonus.py
+++ b/eos/effects/shipbonusorecapshipdronedmgbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusORECapital4"), skill="Capital Industrial Ships")
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusORECapital4"),
+                                 skill="Capital Industrial Ships")
diff --git a/eos/effects/shipbonusoreholdore2.py b/eos/effects/shipbonusoreholdore2.py
index e55e55ea2d..fccf39e520 100644
--- a/eos/effects/shipbonusoreholdore2.py
+++ b/eos/effects/shipbonusoreholdore2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Retriever (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge"))
\ No newline at end of file
+    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/shipbonuspicommoditiesholdgi2.py b/eos/effects/shipbonuspicommoditiesholdgi2.py
index 2b52715763..dfac42672e 100644
--- a/eos/effects/shipbonuspicommoditiesholdgi2.py
+++ b/eos/effects/shipbonuspicommoditiesholdgi2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Epithal
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
+    fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
+                           skill="Gallente Industrial")
diff --git a/eos/effects/shipbonuspiratefrigateprojdamage.py b/eos/effects/shipbonuspiratefrigateprojdamage.py
index e569a3705a..df25253f0f 100644
--- a/eos/effects/shipbonuspiratefrigateprojdamage.py
+++ b/eos/effects/shipbonuspiratefrigateprojdamage.py
@@ -5,6 +5,8 @@
 # Ship: Dramiel
 # Ship: Svipul
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonuspiratesmallhybriddmg.py b/eos/effects/shipbonuspiratesmallhybriddmg.py
index 986b5d59be..40d3e9a00b 100644
--- a/eos/effects/shipbonuspiratesmallhybriddmg.py
+++ b/eos/effects/shipbonuspiratesmallhybriddmg.py
@@ -4,6 +4,8 @@
 # Ship: Daredevil
 # Ship: Hecate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusprojectiledamagembc1.py b/eos/effects/shipbonusprojectiledamagembc1.py
index 0d693b2365..d1d2bb14dd 100644
--- a/eos/effects/shipbonusprojectiledamagembc1.py
+++ b/eos/effects/shipbonusprojectiledamagembc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships named like: Hurricane (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1"),
+                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonusprojectiledamagembc2.py b/eos/effects/shipbonusprojectiledamagembc2.py
index 8128831f19..ef47a0f27e 100644
--- a/eos/effects/shipbonusprojectiledamagembc2.py
+++ b/eos/effects/shipbonusprojectiledamagembc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Sleipnir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2"),
+                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonusprojectiletrackingmbc2.py b/eos/effects/shipbonusprojectiletrackingmbc2.py
index 8add40a2bc..e8cd08be7f 100644
--- a/eos/effects/shipbonusprojectiletrackingmbc2.py
+++ b/eos/effects/shipbonusprojectiletrackingmbc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hurricane Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMBC2"),
+                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonusprojectiletrackingmc2.py b/eos/effects/shipbonusprojectiletrackingmc2.py
index 579fb18647..9d45c3e249 100644
--- a/eos/effects/shipbonusprojectiletrackingmc2.py
+++ b/eos/effects/shipbonusprojectiletrackingmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Stabber Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusptfalloffmb1.py b/eos/effects/shipbonusptfalloffmb1.py
index b72a45b935..b88ecd60b7 100644
--- a/eos/effects/shipbonusptfalloffmb1.py
+++ b/eos/effects/shipbonusptfalloffmb1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vargur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/shipbonusremotearmorrepairamount2af.py
index c672f9496c..68da161e5b 100644
--- a/eos/effects/shipbonusremotearmorrepairamount2af.py
+++ b/eos/effects/shipbonusremotearmorrepairamount2af.py
@@ -4,5 +4,8 @@
 # Ship: Deacon
 # Ship: Inquisitor
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepairamountac2.py b/eos/effects/shipbonusremotearmorrepairamountac2.py
index 2b56129bf1..b671bc1965 100644
--- a/eos/effects/shipbonusremotearmorrepairamountac2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountac2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Augoror
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepairamountgc2.py b/eos/effects/shipbonusremotearmorrepairamountgc2.py
index 7612f01912..ec701a3183 100644
--- a/eos/effects/shipbonusremotearmorrepairamountgc2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountgc2.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Exequror
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGC2"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/shipbonusremotearmorrepairamountgf2.py
index 40475557ad..d1cba90630 100644
--- a/eos/effects/shipbonusremotearmorrepairamountgf2.py
+++ b/eos/effects/shipbonusremotearmorrepairamountgf2.py
@@ -3,5 +3,9 @@
 # Used by:
 # Variations of ship: Navitas (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGF2"),
+                                  skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedac1.py b/eos/effects/shipbonusremotearmorrepaircapneedac1.py
index d9257a835d..d8d32bf666 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedac1.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedac1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Augoror
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
index 56daea7ba2..41c5b3e476 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedaf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedaf.py
@@ -4,5 +4,8 @@
 # Ship: Deacon
 # Ship: Inquisitor
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
index 79788def7f..3c04cdc3a8 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Exequror
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
index 6f2c5fd7ad..b4bc7bbffa 100644
--- a/eos/effects/shipbonusremotearmorrepaircapneedgf.py
+++ b/eos/effects/shipbonusremotearmorrepaircapneedgf.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Navitas (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusremoterepairamountpiratefaction.py b/eos/effects/shipbonusremoterepairamountpiratefaction.py
index 5219c2cad0..f8152a605f 100644
--- a/eos/effects/shipbonusremoterepairamountpiratefaction.py
+++ b/eos/effects/shipbonusremoterepairamountpiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
                                   "armorDamageAmount", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonusremoterepairrangepiratefaction2.py b/eos/effects/shipbonusremoterepairrangepiratefaction2.py
index bdaf8a687c..5512276918 100644
--- a/eos/effects/shipbonusremoterepairrangepiratefaction2.py
+++ b/eos/effects/shipbonusremoterepairrangepiratefaction2.py
@@ -3,8 +3,10 @@
 # Used by:
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
\ No newline at end of file
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusPirateFaction2"))
diff --git a/eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py b/eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py
index 621e5f2e99..0c65a20f26 100644
--- a/eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py
+++ b/eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC2"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusremotetrackingcomputerfalloffmc.py b/eos/effects/shipbonusremotetrackingcomputerfalloffmc.py
index ffc402d883..c760a4b288 100644
--- a/eos/effects/shipbonusremotetrackingcomputerfalloffmc.py
+++ b/eos/effects/shipbonusremotetrackingcomputerfalloffmc.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusMC"),
+                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py
index ae83eaa6ee..09b2fc18d3 100644
--- a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py
+++ b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hyperion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2"),
+                                  skill="Gallente Battleship")
diff --git a/eos/effects/shipbonusrepairsystemsbonusatc2.py b/eos/effects/shipbonusrepairsystemsbonusatc2.py
index 3859785cfc..b2f7bd1aaa 100644
--- a/eos/effects/shipbonusrepairsystemsbonusatc2.py
+++ b/eos/effects/shipbonusrepairsystemsbonusatc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
                                   "armorDamageAmount", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/shipbonusrhmlrof2cb.py
index 172c479f9f..f6c61b3b48 100644
--- a/eos/effects/shipbonusrhmlrof2cb.py
+++ b/eos/effects/shipbonusrhmlrof2cb.py
@@ -4,6 +4,8 @@
 # Ship: Raven
 # Ship: Widow
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
                                   "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusrhmlrofcb.py b/eos/effects/shipbonusrhmlrofcb.py
index 728a0710da..a145864d62 100644
--- a/eos/effects/shipbonusrhmlrofcb.py
+++ b/eos/effects/shipbonusrhmlrofcb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
                                   "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusrhmlrofmb.py b/eos/effects/shipbonusrhmlrofmb.py
index 575e39727a..1f972e2eaa 100644
--- a/eos/effects/shipbonusrhmlrofmb.py
+++ b/eos/effects/shipbonusrhmlrofmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
                                   "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonussalvagecycleaf.py b/eos/effects/shipbonussalvagecycleaf.py
index 9b4f3b372d..c5cdf079cd 100644
--- a/eos/effects/shipbonussalvagecycleaf.py
+++ b/eos/effects/shipbonussalvagecycleaf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
                                   "duration", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonussalvagecyclecf.py b/eos/effects/shipbonussalvagecyclecf.py
index bdf4d4b9d6..88802e78e0 100644
--- a/eos/effects/shipbonussalvagecyclecf.py
+++ b/eos/effects/shipbonussalvagecyclecf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Heron
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
                                   "duration", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonussalvagecyclegf.py b/eos/effects/shipbonussalvagecyclegf.py
index 095ea42b83..60dd7e948e 100644
--- a/eos/effects/shipbonussalvagecyclegf.py
+++ b/eos/effects/shipbonussalvagecyclegf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Imicus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
                                   "duration", ship.getModifiedItemAttr("shipBonusGF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonussalvagecyclemf.py b/eos/effects/shipbonussalvagecyclemf.py
index f4544c74b2..738c4e6ebb 100644
--- a/eos/effects/shipbonussalvagecyclemf.py
+++ b/eos/effects/shipbonussalvagecyclemf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Probe
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
                                   "duration", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusscanprobestrength2af.py b/eos/effects/shipbonusscanprobestrength2af.py
index f1e0c05d9e..e3df5259cf 100644
--- a/eos/effects/shipbonusscanprobestrength2af.py
+++ b/eos/effects/shipbonusscanprobestrength2af.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF"),
+                                    skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusscanprobestrengthcf.py b/eos/effects/shipbonusscanprobestrengthcf.py
index 06d8c2a59a..0e61528b2d 100644
--- a/eos/effects/shipbonusscanprobestrengthcf.py
+++ b/eos/effects/shipbonusscanprobestrengthcf.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Heron
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
\ No newline at end of file
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2"),
+                                    skill="Caldari Frigate")
diff --git a/eos/effects/shipbonusscanprobestrengthgf.py b/eos/effects/shipbonusscanprobestrengthgf.py
index 0d419793ba..aed2e3d3a6 100644
--- a/eos/effects/shipbonusscanprobestrengthgf.py
+++ b/eos/effects/shipbonusscanprobestrengthgf.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Imicus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2"),
+                                    skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusscanprobestrengthmf.py b/eos/effects/shipbonusscanprobestrengthmf.py
index 27375af1bc..8caaf24110 100644
--- a/eos/effects/shipbonusscanprobestrengthmf.py
+++ b/eos/effects/shipbonusscanprobestrengthmf.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Probe
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2"),
+                                    skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonussentryarmorhpgc3.py b/eos/effects/shipbonussentryarmorhpgc3.py
index ebf024b2a2..e5795c26f6 100644
--- a/eos/effects/shipbonussentryarmorhpgc3.py
+++ b/eos/effects/shipbonussentryarmorhpgc3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonussentrydamagemultipliergc3.py b/eos/effects/shipbonussentrydamagemultipliergc3.py
index 40e9489d44..fde740a9a6 100644
--- a/eos/effects/shipbonussentrydamagemultipliergc3.py
+++ b/eos/effects/shipbonussentrydamagemultipliergc3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonussentrydronearmorhppiratefaction.py b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
index 9e657cc303..b2cf85c491 100644
--- a/eos/effects/shipbonussentrydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
index ed68433d55..27da3b576d 100644
--- a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonussentrydronehppiratefaction.py b/eos/effects/shipbonussentrydronehppiratefaction.py
index d7933f6583..0399ccfc8c 100644
--- a/eos/effects/shipbonussentrydronehppiratefaction.py
+++ b/eos/effects/shipbonussentrydronehppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py
index 6c5f64edc2..7704bffed6 100644
--- a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py
+++ b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                 "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
index 92e980074c..d69820fca7 100644
--- a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py
index 5e3cad2588..aab03ea9eb 100644
--- a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py
+++ b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers")
+                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
+                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/shipbonussentryhpgc3.py b/eos/effects/shipbonussentryhpgc3.py
index 4ab87a24e9..b2545b29ff 100644
--- a/eos/effects/shipbonussentryhpgc3.py
+++ b/eos/effects/shipbonussentryhpgc3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "hp", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonussentryshieldhpgc3.py b/eos/effects/shipbonussentryshieldhpgc3.py
index 6f968c1e3b..6161d241f1 100644
--- a/eos/effects/shipbonussentryshieldhpgc3.py
+++ b/eos/effects/shipbonussentryshieldhpgc3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ishtar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
                                  "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusshieldboostamountmc2.py b/eos/effects/shipbonusshieldboostamountmc2.py
index 97d7eb3ed7..8acf3337a8 100644
--- a/eos/effects/shipbonusshieldboostamountmc2.py
+++ b/eos/effects/shipbonusshieldboostamountmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vagabond
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusshieldboostci2.py b/eos/effects/shipbonusshieldboostci2.py
index b4c6011469..5941023796 100644
--- a/eos/effects/shipbonusshieldboostci2.py
+++ b/eos/effects/shipbonusshieldboostci2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Bustard
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/shipbonusshieldboostermb1a.py b/eos/effects/shipbonusshieldboostermb1a.py
index 10c8f3c721..be92006c98 100644
--- a/eos/effects/shipbonusshieldboostermb1a.py
+++ b/eos/effects/shipbonusshieldboostermb1a.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Maelstrom
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusshieldboostmi2.py b/eos/effects/shipbonusshieldboostmi2.py
index 34325c73a1..628c261abc 100644
--- a/eos/effects/shipbonusshieldboostmi2.py
+++ b/eos/effects/shipbonusshieldboostmi2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Mastodon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/shipbonusshieldcapacityore2.py b/eos/effects/shipbonusshieldcapacityore2.py
index 497f29f570..9010263232 100644
--- a/eos/effects/shipbonusshieldcapacityore2.py
+++ b/eos/effects/shipbonusshieldcapacityore2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Procurer (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge"))
+    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/shipbonusshieldemresistancecd2.py b/eos/effects/shipbonusshieldemresistancecd2.py
index bbae401465..059c76dfd7 100644
--- a/eos/effects/shipbonusshieldemresistancecd2.py
+++ b/eos/effects/shipbonusshieldemresistancecd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
+                           skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldexplosiveresistancecd2.py b/eos/effects/shipbonusshieldexplosiveresistancecd2.py
index 04f590b5bd..70944c9f2f 100644
--- a/eos/effects/shipbonusshieldexplosiveresistancecd2.py
+++ b/eos/effects/shipbonusshieldexplosiveresistancecd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
+                           skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldkineticresistancecd2.py b/eos/effects/shipbonusshieldkineticresistancecd2.py
index d48537e8d1..11f8a77d8c 100644
--- a/eos/effects/shipbonusshieldkineticresistancecd2.py
+++ b/eos/effects/shipbonusshieldkineticresistancecd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
+                           skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldthermalresistancecd2.py b/eos/effects/shipbonusshieldthermalresistancecd2.py
index 2554e9bcec..b4c5042f5b 100644
--- a/eos/effects/shipbonusshieldthermalresistancecd2.py
+++ b/eos/effects/shipbonusshieldthermalresistancecd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
+                           skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusshieldtransferboostamountcc2.py b/eos/effects/shipbonusshieldtransferboostamountcc2.py
index 6d26b7cf2b..734821576d 100644
--- a/eos/effects/shipbonusshieldtransferboostamountcc2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountcc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Osprey
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusshieldtransferboostamountcf2.py b/eos/effects/shipbonusshieldtransferboostamountcf2.py
index 601c4ca7fa..164975e923 100644
--- a/eos/effects/shipbonusshieldtransferboostamountcf2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountcf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Bantam (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonusshieldtransferboostamountmc2.py b/eos/effects/shipbonusshieldtransferboostamountmc2.py
index e427eaead3..9018262816 100644
--- a/eos/effects/shipbonusshieldtransferboostamountmc2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusshieldtransferboostamountmf2.py b/eos/effects/shipbonusshieldtransferboostamountmf2.py
index 9cca8c9e09..a1c5525245 100644
--- a/eos/effects/shipbonusshieldtransferboostamountmf2.py
+++ b/eos/effects/shipbonusshieldtransferboostamountmf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Burst (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusshieldtransfercapneed1.py b/eos/effects/shipbonusshieldtransfercapneed1.py
index 1414679f29..6a7ab5f909 100644
--- a/eos/effects/shipbonusshieldtransfercapneed1.py
+++ b/eos/effects/shipbonusshieldtransfercapneed1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Osprey
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusshieldtransfercapneedcf.py b/eos/effects/shipbonusshieldtransfercapneedcf.py
index 6f216c594d..61732a5575 100644
--- a/eos/effects/shipbonusshieldtransfercapneedcf.py
+++ b/eos/effects/shipbonusshieldtransfercapneedcf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Bantam (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonusshieldtransfercapneedmc1.py b/eos/effects/shipbonusshieldtransfercapneedmc1.py
index ffab0d6a6a..89d41277d8 100644
--- a/eos/effects/shipbonusshieldtransfercapneedmc1.py
+++ b/eos/effects/shipbonusshieldtransfercapneedmc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scythe
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipbonusshieldtransfercapneedmf.py b/eos/effects/shipbonusshieldtransfercapneedmf.py
index 9ea17daa44..3f164c5248 100644
--- a/eos/effects/shipbonusshieldtransfercapneedmf.py
+++ b/eos/effects/shipbonusshieldtransfercapneedmf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Burst (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonussmallenergyturretdamageatf1.py b/eos/effects/shipbonussmallenergyturretdamageatf1.py
index dd17ac90bf..483f39915e 100644
--- a/eos/effects/shipbonussmallenergyturretdamageatf1.py
+++ b/eos/effects/shipbonussmallenergyturretdamageatf1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
index 33e63d389d..40abb0284a 100644
--- a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
@@ -6,6 +6,8 @@
 # Ship: Imp
 # Ship: Succubus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipbonussmallenergyturrettracking2af.py b/eos/effects/shipbonussmallenergyturrettracking2af.py
index dc808a81dd..76232e8f4e 100644
--- a/eos/effects/shipbonussmallenergyturrettracking2af.py
+++ b/eos/effects/shipbonussmallenergyturrettracking2af.py
@@ -4,6 +4,8 @@
 # Ship: Imp
 # Ship: Succubus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py b/eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py
index 948481a4a9..85f5ba9245 100644
--- a/eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py
+++ b/eos/effects/shipbonussmallenergyweaponoptimalrangeatf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipbonussmallhybridmaxrangeatf2.py b/eos/effects/shipbonussmallhybridmaxrangeatf2.py
index 908431c5fd..e1312bf056 100644
--- a/eos/effects/shipbonussmallhybridmaxrangeatf2.py
+++ b/eos/effects/shipbonussmallhybridmaxrangeatf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Utu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipbonussmallhybridtrackingspeedatf2.py b/eos/effects/shipbonussmallhybridtrackingspeedatf2.py
index a6bc89699d..5d01319528 100644
--- a/eos/effects/shipbonussmallhybridtrackingspeedatf2.py
+++ b/eos/effects/shipbonussmallhybridtrackingspeedatf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Utu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py
index df0731eaf7..b471d2d1d1 100644
--- a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py
+++ b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Flycatcher
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscf2.py b/eos/effects/shipbonussmallmissileexplosionradiuscf2.py
index f6fb52ef2a..6a10c458c4 100644
--- a/eos/effects/shipbonussmallmissileexplosionradiuscf2.py
+++ b/eos/effects/shipbonussmallmissileexplosionradiuscf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Crow
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/shipbonussptfalloffmf2.py
index 2d65eb1f66..9ec05f2c4c 100644
--- a/eos/effects/shipbonussptfalloffmf2.py
+++ b/eos/effects/shipbonussptfalloffmf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rifter
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusstasismf2.py b/eos/effects/shipbonusstasismf2.py
index 4b364d15c2..6589228990 100644
--- a/eos/effects/shipbonusstasismf2.py
+++ b/eos/effects/shipbonusstasismf2.py
@@ -4,6 +4,8 @@
 # Ship: Cruor
 # Ship: Freki
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusstasiswebspeedfactormb.py b/eos/effects/shipbonusstasiswebspeedfactormb.py
index 9d4a0aa861..b0d4a1f797 100644
--- a/eos/effects/shipbonusstasiswebspeedfactormb.py
+++ b/eos/effects/shipbonusstasiswebspeedfactormb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vindicator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "speedFactor", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py b/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py
index 084d27cd75..c693def963 100644
--- a/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py
+++ b/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Legion
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr"), skill="Amarr Strategic Cruiser")
+                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr"),
+                                  skill="Amarr Strategic Cruiser")
diff --git a/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py b/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py
index 30e53b90bf..23e346ffec 100644
--- a/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py
+++ b/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Tengu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari"), skill="Caldari Strategic Cruiser")
+                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari"),
+                                  skill="Caldari Strategic Cruiser")
diff --git a/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py b/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py
index 71ad1a2e6d..8e0be35d86 100644
--- a/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py
+++ b/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Proteus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente"), skill="Gallente Strategic Cruiser")
+                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente"),
+                                  skill="Gallente Strategic Cruiser")
diff --git a/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py b/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py
index a53f4c61df..800b5aa2a2 100644
--- a/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py
+++ b/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Loki
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar"), skill="Minmatar Strategic Cruiser")
+                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar"),
+                                  skill="Minmatar Strategic Cruiser")
diff --git a/eos/effects/shipbonussupercarriera1fighterdamage.py b/eos/effects/shipbonussupercarriera1fighterdamage.py
index a093c63aae..1c1900cba1 100644
--- a/eos/effects/shipbonussupercarriera1fighterdamage.py
+++ b/eos/effects/shipbonussupercarriera1fighterdamage.py
@@ -4,7 +4,15 @@
 # Ship: Aeon
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera2armorresists.py b/eos/effects/shipbonussupercarriera2armorresists.py
index 3fb12647be..4eafbff18d 100644
--- a/eos/effects/shipbonussupercarriera2armorresists.py
+++ b/eos/effects/shipbonussupercarriera2armorresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Aeon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
+                           skill="Amarr Carrier")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
+                           skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera2fighterapplicationbonus.py b/eos/effects/shipbonussupercarriera2fighterapplicationbonus.py
index c8567faf79..ef805c824c 100644
--- a/eos/effects/shipbonussupercarriera2fighterapplicationbonus.py
+++ b/eos/effects/shipbonussupercarriera2fighterapplicationbonus.py
@@ -3,6 +3,12 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionVelocity", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionVelocity", src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionVelocity",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionVelocity",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera3warpstrength.py b/eos/effects/shipbonussupercarriera3warpstrength.py
index 13c8b01607..caee35c381 100644
--- a/eos/effects/shipbonussupercarriera3warpstrength.py
+++ b/eos/effects/shipbonussupercarriera3warpstrength.py
@@ -4,5 +4,8 @@
 # Ship: Aeon
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierA3"), skill="Amarr Carrier")
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierA3"),
+                              skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera4burstprojectorbonus.py b/eos/effects/shipbonussupercarriera4burstprojectorbonus.py
index e4ad92cdcc..49c41fdd64 100644
--- a/eos/effects/shipbonussupercarriera4burstprojectorbonus.py
+++ b/eos/effects/shipbonussupercarriera4burstprojectorbonus.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Aeon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "durationWeaponDisruptionBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
+                                  "durationWeaponDisruptionBurstProjector",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera4fighterapplicationbonus.py b/eos/effects/shipbonussupercarriera4fighterapplicationbonus.py
index 4a28f6b5f4..b24c555c9f 100644
--- a/eos/effects/shipbonussupercarriera4fighterapplicationbonus.py
+++ b/eos/effects/shipbonussupercarriera4fighterapplicationbonus.py
@@ -3,6 +3,12 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesExplosionRadius", src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileExplosionRadius", src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesExplosionRadius",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileExplosionRadius",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarriera5warfarelinksbonus.py b/eos/effects/shipbonussupercarriera5warfarelinksbonus.py
index eb48a01919..71b48d6ca6 100644
--- a/eos/effects/shipbonussupercarriera5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarriera5warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Aeon
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonussupercarrierc1fighterdamage.py b/eos/effects/shipbonussupercarrierc1fighterdamage.py
index b96d89ad77..680e6ac245 100644
--- a/eos/effects/shipbonussupercarrierc1fighterdamage.py
+++ b/eos/effects/shipbonussupercarrierc1fighterdamage.py
@@ -4,7 +4,15 @@
 # Ship: Revenant
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierc2afterburnerbonus.py b/eos/effects/shipbonussupercarrierc2afterburnerbonus.py
index 4ec8670873..832a17efff 100644
--- a/eos/effects/shipbonussupercarrierc2afterburnerbonus.py
+++ b/eos/effects/shipbonussupercarrierc2afterburnerbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Revenant
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor", src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierc2shieldresists.py b/eos/effects/shipbonussupercarrierc2shieldresists.py
index f8334921ba..5f9e36e9b5 100644
--- a/eos/effects/shipbonussupercarrierc2shieldresists.py
+++ b/eos/effects/shipbonussupercarrierc2shieldresists.py
@@ -3,8 +3,14 @@
 # Used by:
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
+                           skill="Caldari Carrier")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
+                           skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierc3warpstrength.py b/eos/effects/shipbonussupercarrierc3warpstrength.py
index d61a963708..9a18457fd4 100644
--- a/eos/effects/shipbonussupercarrierc3warpstrength.py
+++ b/eos/effects/shipbonussupercarrierc3warpstrength.py
@@ -4,5 +4,8 @@
 # Ship: Revenant
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierC3"), skill="Caldari Carrier")
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierC3"),
+                              skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierc4burstprojectorbonus.py b/eos/effects/shipbonussupercarrierc4burstprojectorbonus.py
index e26358a720..ce70f80f29 100644
--- a/eos/effects/shipbonussupercarrierc4burstprojectorbonus.py
+++ b/eos/effects/shipbonussupercarrierc4burstprojectorbonus.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "durationECMJammerBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierC4"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
+                                  "durationECMJammerBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierC4"),
+                                  skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py b/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
index ef76d206b9..1064421b70 100644
--- a/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Wyvern
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
diff --git a/eos/effects/shipbonussupercarrierg1fighterdamage.py b/eos/effects/shipbonussupercarrierg1fighterdamage.py
index 02a96966b5..835a0f3fcf 100644
--- a/eos/effects/shipbonussupercarrierg1fighterdamage.py
+++ b/eos/effects/shipbonussupercarrierg1fighterdamage.py
@@ -3,7 +3,15 @@
 # Used by:
 # Variations of ship: Nyx (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonussupercarrierg2fighterhitpoints.py b/eos/effects/shipbonussupercarrierg2fighterhitpoints.py
index b1deb85733..5b23ff7370 100644
--- a/eos/effects/shipbonussupercarrierg2fighterhitpoints.py
+++ b/eos/effects/shipbonussupercarrierg2fighterhitpoints.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Nyx (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("shipBonusSupercarrierG2"), skill="Gallente Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierG2"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonussupercarrierg3warpstrength.py b/eos/effects/shipbonussupercarrierg3warpstrength.py
index 3b224338fe..5c361a79e8 100644
--- a/eos/effects/shipbonussupercarrierg3warpstrength.py
+++ b/eos/effects/shipbonussupercarrierg3warpstrength.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Nyx (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierG3"), skill="Gallente Carrier")
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierG3"),
+                              skill="Gallente Carrier")
diff --git a/eos/effects/shipbonussupercarrierg4burstprojectorbonus.py b/eos/effects/shipbonussupercarrierg4burstprojectorbonus.py
index d3f3cd7a2f..74b6a3ba63 100644
--- a/eos/effects/shipbonussupercarrierg4burstprojectorbonus.py
+++ b/eos/effects/shipbonussupercarrierg4burstprojectorbonus.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Nyx
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "durationSensorDampeningBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierG4"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
+                                  "durationSensorDampeningBurstProjector",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py b/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
index b1d9755239..432f092ab8 100644
--- a/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Nyx
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
diff --git a/eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py b/eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py
index a7981f59e4..534d7357c0 100644
--- a/eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py
+++ b/eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py
@@ -4,5 +4,8 @@
 # Ship: Hel
 # Ship: Vendetta
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierm1fighterdamage.py b/eos/effects/shipbonussupercarrierm1fighterdamage.py
index 5d1f736135..072aa25733 100644
--- a/eos/effects/shipbonussupercarrierm1fighterdamage.py
+++ b/eos/effects/shipbonussupercarrierm1fighterdamage.py
@@ -3,7 +3,15 @@
 # Used by:
 # Ship: Hel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierm2fightervelocity.py b/eos/effects/shipbonussupercarrierm2fightervelocity.py
index f119d52350..d908f242cb 100644
--- a/eos/effects/shipbonussupercarrierm2fightervelocity.py
+++ b/eos/effects/shipbonussupercarrierm2fightervelocity.py
@@ -4,5 +4,8 @@
 # Ship: Hel
 # Ship: Vendetta
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("shipBonusSupercarrierM2"), skill="Minmatar Carrier")
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("shipBonusSupercarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierm3warpstrength.py b/eos/effects/shipbonussupercarrierm3warpstrength.py
index 5e328b84e1..dd652f5783 100644
--- a/eos/effects/shipbonussupercarrierm3warpstrength.py
+++ b/eos/effects/shipbonussupercarrierm3warpstrength.py
@@ -4,5 +4,8 @@
 # Ship: Hel
 # Ship: Vendetta
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierM3"), skill="Minmatar Carrier")
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierM3"),
+                              skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierm4burstprojectorbonus.py b/eos/effects/shipbonussupercarrierm4burstprojectorbonus.py
index bc5a9972a5..d75b19a168 100644
--- a/eos/effects/shipbonussupercarrierm4burstprojectorbonus.py
+++ b/eos/effects/shipbonussupercarrierm4burstprojectorbonus.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Hel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "durationTargetIlluminationBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierM4"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
+                                  "durationTargetIlluminationBurstProjector",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py b/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
index f742dd710a..0c76ab95fb 100644
--- a/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
+++ b/eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ship: Hel
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus",
+                                  src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonussupercarrierrole1numwarfarelinks.py b/eos/effects/shipbonussupercarrierrole1numwarfarelinks.py
index 60bf8d1aef..05dcff6a1b 100644
--- a/eos/effects/shipbonussupercarrierrole1numwarfarelinks.py
+++ b/eos/effects/shipbonussupercarrierrole1numwarfarelinks.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Supercarrier (6 of 6)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole1"))
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
+                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py b/eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py
index de6d7f4855..283256d6c8 100644
--- a/eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py
+++ b/eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ships from group: Supercarrier (6 of 6)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
+                                  src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
+                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
index 2e1ede7067..176b1279d6 100644
--- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
+++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships from group: Covert Ops (4 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Survey Probe",
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCoverOps3"), skill="Covert Ops")
+                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCoverOps3"),
+                                    skill="Covert Ops")
diff --git a/eos/effects/shipbonustargetpainteroptimalmf1.py b/eos/effects/shipbonustargetpainteroptimalmf1.py
index b0dbdc28d3..da9b2c09fc 100644
--- a/eos/effects/shipbonustargetpainteroptimalmf1.py
+++ b/eos/effects/shipbonustargetpainteroptimalmf1.py
@@ -4,6 +4,8 @@
 # Ship: Hyena
 # Ship: Vigil
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonustdoptimalbonusaf1.py b/eos/effects/shipbonustdoptimalbonusaf1.py
index 5903beac5f..9ef068a925 100644
--- a/eos/effects/shipbonustdoptimalbonusaf1.py
+++ b/eos/effects/shipbonustdoptimalbonusaf1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Crucifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonusthermalarmorresistancead2.py b/eos/effects/shipbonusthermalarmorresistancead2.py
index 1754775480..3a1d5f2064 100644
--- a/eos/effects/shipbonusthermalarmorresistancead2.py
+++ b/eos/effects/shipbonusthermalarmorresistancead2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Pontifex
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
+                           skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusthermalarmorresistancegd2.py b/eos/effects/shipbonusthermalarmorresistancegd2.py
index aeee7c1efb..722d1b044d 100644
--- a/eos/effects/shipbonusthermalarmorresistancegd2.py
+++ b/eos/effects/shipbonusthermalarmorresistancegd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Magus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
+                           skill="Gallente Destroyer")
diff --git a/eos/effects/shipbonusthermalmissiledamagecd1.py b/eos/effects/shipbonusthermalmissiledamagecd1.py
index 060decddee..514c58b4dc 100644
--- a/eos/effects/shipbonusthermalmissiledamagecd1.py
+++ b/eos/effects/shipbonusthermalmissiledamagecd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Stork
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipbonusthermalmissiledamagegb2.py b/eos/effects/shipbonusthermalmissiledamagegb2.py
index fc08b37dba..65b8c1ba58 100644
--- a/eos/effects/shipbonusthermalmissiledamagegb2.py
+++ b/eos/effects/shipbonusthermalmissiledamagegb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships named like: Rattlesnake (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2"),
+                                    skill="Gallente Battleship")
diff --git a/eos/effects/shipbonusthermalmissiledamagegc2.py b/eos/effects/shipbonusthermalmissiledamagegc2.py
index 8f1c23eb7c..e939aa4e65 100644
--- a/eos/effects/shipbonusthermalmissiledamagegc2.py
+++ b/eos/effects/shipbonusthermalmissiledamagegc2.py
@@ -5,6 +5,8 @@
 # Ship: Gila
 
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonusthermalmissiledamagegf.py b/eos/effects/shipbonusthermalmissiledamagegf.py
index 903dd9804c..30d7627282 100644
--- a/eos/effects/shipbonusthermalmissiledamagegf.py
+++ b/eos/effects/shipbonusthermalmissiledamagegf.py
@@ -4,6 +4,8 @@
 # Ship: Whiptail
 # Ship: Worm
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonusthermalshieldresistancemd2.py b/eos/effects/shipbonusthermalshieldresistancemd2.py
index a7221bc88a..5d41685a04 100644
--- a/eos/effects/shipbonusthermalshieldresistancemd2.py
+++ b/eos/effects/shipbonusthermalshieldresistancemd2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
+                           skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py
index 0819cd08e6..af97edbed1 100644
--- a/eos/effects/shipbonusthermicshieldresistancecb2.py
+++ b/eos/effects/shipbonusthermicshieldresistancecb2.py
@@ -5,5 +5,8 @@
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
+                           skill="Caldari Battleship")
diff --git a/eos/effects/shipbonusthermmissiledmgmd1.py b/eos/effects/shipbonusthermmissiledmgmd1.py
index 5f1d29b7a2..cb804bcc11 100644
--- a/eos/effects/shipbonusthermmissiledmgmd1.py
+++ b/eos/effects/shipbonusthermmissiledmgmd1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Bifrost
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipbonustitana1damagebonus.py b/eos/effects/shipbonustitana1damagebonus.py
index 17f7276963..92ec95b486 100644
--- a/eos/effects/shipbonustitana1damagebonus.py
+++ b/eos/effects/shipbonustitana1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Avatar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/shipbonustitana2capneed.py b/eos/effects/shipbonustitana2capneed.py
index bec69b6161..93084ad754 100644
--- a/eos/effects/shipbonustitana2capneed.py
+++ b/eos/effects/shipbonustitana2capneed.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Avatar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed", src.getModifiedItemAttr("shipBonusTitanA2"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
+                                  src.getModifiedItemAttr("shipBonusTitanA2"), skill="Amarr Titan")
diff --git a/eos/effects/shipbonustitana3warpstrength.py b/eos/effects/shipbonustitana3warpstrength.py
index a496c1bfd7..c7c5bfca59 100644
--- a/eos/effects/shipbonustitana3warpstrength.py
+++ b/eos/effects/shipbonustitana3warpstrength.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Avatar
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanA3"), skill="Amarr Titan")
diff --git a/eos/effects/shipbonustitana4fleetbonus.py b/eos/effects/shipbonustitana4fleetbonus.py
index b84dfd698d..665ed5b3f9 100644
--- a/eos/effects/shipbonustitana4fleetbonus.py
+++ b/eos/effects/shipbonustitana4fleetbonus.py
@@ -8,7 +8,9 @@
 gangBonusSkill = "Amarr Titan"
 runTime = "late"
 
-def handler(fit, src, context):
-    if "gang" not in context: return
-    fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
 
+def handler(fit, src, context):
+    if "gang" not in context:
+        return
+    fit.ship.boostItemAttr(gangBoost,
+                           src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
diff --git a/eos/effects/shipbonustitanc1kindamagebonus.py b/eos/effects/shipbonustitanc1kindamagebonus.py
index 0ca0dd6712..08ea4ea521 100644
--- a/eos/effects/shipbonustitanc1kindamagebonus.py
+++ b/eos/effects/shipbonustitanc1kindamagebonus.py
@@ -3,7 +3,12 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
diff --git a/eos/effects/shipbonustitanc2rofbonus.py b/eos/effects/shipbonustitanc2rofbonus.py
index cd131d5d62..af73b2761a 100644
--- a/eos/effects/shipbonustitanc2rofbonus.py
+++ b/eos/effects/shipbonustitanc2rofbonus.py
@@ -3,7 +3,12 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Cruise", "speed", src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Torpedo", "speed", src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Torpedo", "speed", src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Cruise", "speed",
+                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Torpedo", "speed",
+                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Torpedo", "speed",
+                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
diff --git a/eos/effects/shipbonustitanc3warpstrength.py b/eos/effects/shipbonustitanc3warpstrength.py
index 2cfdc56c40..e82b02ef3e 100644
--- a/eos/effects/shipbonustitanc3warpstrength.py
+++ b/eos/effects/shipbonustitanc3warpstrength.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanC3"), skill="Caldari Titan")
diff --git a/eos/effects/shipbonustitanc4fleetbonus.py b/eos/effects/shipbonustitanc4fleetbonus.py
index c9d5aff1e8..7120e33495 100644
--- a/eos/effects/shipbonustitanc4fleetbonus.py
+++ b/eos/effects/shipbonustitanc4fleetbonus.py
@@ -8,7 +8,9 @@
 gangBonusSkill = "Caldari Titan"
 runTime = "late"
 
-def handler(fit, src, context):
-    if "gang" not in context: return
-    fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
 
+def handler(fit, src, context):
+    if "gang" not in context:
+        return
+    fit.ship.boostItemAttr(gangBoost,
+                           src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
diff --git a/eos/effects/shipbonustitanc5alldamagebonus.py b/eos/effects/shipbonustitanc5alldamagebonus.py
index 49e1a46518..13c64f8f2f 100644
--- a/eos/effects/shipbonustitanc5alldamagebonus.py
+++ b/eos/effects/shipbonustitanc5alldamagebonus.py
@@ -3,13 +3,24 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage", src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
diff --git a/eos/effects/shipbonustitang1damagebonus.py b/eos/effects/shipbonustitang1damagebonus.py
index 065bb43fbc..e44f41f539 100644
--- a/eos/effects/shipbonustitang1damagebonus.py
+++ b/eos/effects/shipbonustitang1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Erebus
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/shipbonustitang2rofbonus.py b/eos/effects/shipbonustitang2rofbonus.py
index 5238d286c2..87c12394de 100644
--- a/eos/effects/shipbonustitang2rofbonus.py
+++ b/eos/effects/shipbonustitang2rofbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Erebus (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
+                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
diff --git a/eos/effects/shipbonustitang3warpstrength.py b/eos/effects/shipbonustitang3warpstrength.py
index 658670607f..003c1be4af 100644
--- a/eos/effects/shipbonustitang3warpstrength.py
+++ b/eos/effects/shipbonustitang3warpstrength.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Erebus (2 of 2)
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanG3"), skill="Gallente Titan")
diff --git a/eos/effects/shipbonustitang4fleetbonus.py b/eos/effects/shipbonustitang4fleetbonus.py
index 7edfdce02f..1e3ab39690 100644
--- a/eos/effects/shipbonustitang4fleetbonus.py
+++ b/eos/effects/shipbonustitang4fleetbonus.py
@@ -8,7 +8,9 @@
 gangBonusSkill = "Gallente Titan"
 runTime = "late"
 
-def handler(fit, src, context):
-    if "gang" not in context: return
-    fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
 
+def handler(fit, src, context):
+    if "gang" not in context:
+        return
+    fit.ship.boostItemAttr(gangBoost,
+                           src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
diff --git a/eos/effects/shipbonustitanm1damagebonus.py b/eos/effects/shipbonustitanm1damagebonus.py
index f011547f23..538a0d8fc8 100644
--- a/eos/effects/shipbonustitanm1damagebonus.py
+++ b/eos/effects/shipbonustitanm1damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Ragnarok
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/shipbonustitanm1webbonus.py b/eos/effects/shipbonustitanm1webbonus.py
index 7a8d72d39d..6abfca9dd8 100644
--- a/eos/effects/shipbonustitanm1webbonus.py
+++ b/eos/effects/shipbonustitanm1webbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vanquisher
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
+                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/shipbonustitanm2rofbonus.py b/eos/effects/shipbonustitanm2rofbonus.py
index ba663cf9f2..4776980826 100644
--- a/eos/effects/shipbonustitanm2rofbonus.py
+++ b/eos/effects/shipbonustitanm2rofbonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Ragnarok
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusTitanM2"), skill="Minmatar Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
+                                  src.getModifiedItemAttr("shipBonusTitanM2"), skill="Minmatar Titan")
diff --git a/eos/effects/shipbonustitanm3warpstrength.py b/eos/effects/shipbonustitanm3warpstrength.py
index 3d1c82e91b..de59fc61e6 100644
--- a/eos/effects/shipbonustitanm3warpstrength.py
+++ b/eos/effects/shipbonustitanm3warpstrength.py
@@ -4,5 +4,7 @@
 # Ship: Ragnarok
 # Ship: Vanquisher
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanM3"), skill="Minmatar Titan")
diff --git a/eos/effects/shipbonustitanm4fleetbonus.py b/eos/effects/shipbonustitanm4fleetbonus.py
index 931775bb22..3cb74a1c9b 100644
--- a/eos/effects/shipbonustitanm4fleetbonus.py
+++ b/eos/effects/shipbonustitanm4fleetbonus.py
@@ -8,7 +8,9 @@
 gangBonusSkill = "Minmatar Titan"
 runTime = "late"
 
-def handler(fit, src, context):
-    if "gang" not in context: return
-    fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
 
+def handler(fit, src, context):
+    if "gang" not in context:
+        return
+    fit.ship.boostItemAttr(gangBoost,
+                           src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)
diff --git a/eos/effects/shipbonustitanrole1numwarfarelinks.py b/eos/effects/shipbonustitanrole1numwarfarelinks.py
index 0f3aa4c4d2..67a017e32f 100644
--- a/eos/effects/shipbonustitanrole1numwarfarelinks.py
+++ b/eos/effects/shipbonustitanrole1numwarfarelinks.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ships from group: Titan (5 of 5)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole1"))
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
+                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py b/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py
index ca4a8baf9c..a964d0635d 100644
--- a/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py
+++ b/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py
@@ -3,6 +3,10 @@
 # Used by:
 # Ships from group: Titan (5 of 5)
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
+                                  src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
+                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/shipbonustitanrole3damagebonus.py b/eos/effects/shipbonustitanrole3damagebonus.py
index 20b7544bbf..1bb3e16a64 100644
--- a/eos/effects/shipbonustitanrole3damagebonus.py
+++ b/eos/effects/shipbonustitanrole3damagebonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vanquisher
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/shipbonustitanrole3torpdeovelocitybonus.py b/eos/effects/shipbonustitanrole3torpdeovelocitybonus.py
index 75d2a4cdde..ef1b441ff9 100644
--- a/eos/effects/shipbonustitanrole3torpdeovelocitybonus.py
+++ b/eos/effects/shipbonustitanrole3torpdeovelocitybonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity", src.getModifiedItemAttr("shipBonusRole3"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
+                                    src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/shipbonustorpedomissileemdmgmb.py b/eos/effects/shipbonustorpedomissileemdmgmb.py
index 6659b52d2a..d0035967dc 100644
--- a/eos/effects/shipbonustorpedomissileemdmgmb.py
+++ b/eos/effects/shipbonustorpedomissileemdmgmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonustorpedomissileexplodmgmb.py b/eos/effects/shipbonustorpedomissileexplodmgmb.py
index 284046faad..75ddfe45eb 100644
--- a/eos/effects/shipbonustorpedomissileexplodmgmb.py
+++ b/eos/effects/shipbonustorpedomissileexplodmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonustorpedomissilekineticdmgmb.py b/eos/effects/shipbonustorpedomissilekineticdmgmb.py
index f13096e491..34aaf86f63 100644
--- a/eos/effects/shipbonustorpedomissilekineticdmgmb.py
+++ b/eos/effects/shipbonustorpedomissilekineticdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonustorpedomissilethermdmgmb.py b/eos/effects/shipbonustorpedomissilethermdmgmb.py
index 693f6ee7a1..ea7d1baff8 100644
--- a/eos/effects/shipbonustorpedomissilethermdmgmb.py
+++ b/eos/effects/shipbonustorpedomissilethermdmgmb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
+                                    skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonustorpedorofmb.py b/eos/effects/shipbonustorpedorofmb.py
index 3234d5a2ae..2695607eab 100644
--- a/eos/effects/shipbonustorpedorofmb.py
+++ b/eos/effects/shipbonustorpedorofmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Typhoon
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
                                   "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipbonustorpedovelocity2af.py b/eos/effects/shipbonustorpedovelocity2af.py
index 7f0bc64ac1..0109217d50 100644
--- a/eos/effects/shipbonustorpedovelocity2af.py
+++ b/eos/effects/shipbonustorpedovelocity2af.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Purifier
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipbonustorpedovelocitycf2.py b/eos/effects/shipbonustorpedovelocitycf2.py
index 374186aa26..5c779651b6 100644
--- a/eos/effects/shipbonustorpedovelocitycf2.py
+++ b/eos/effects/shipbonustorpedovelocitycf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Manticore
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipbonustorpedovelocitygf2.py b/eos/effects/shipbonustorpedovelocitygf2.py
index 91a13f1fa9..188c679d54 100644
--- a/eos/effects/shipbonustorpedovelocitygf2.py
+++ b/eos/effects/shipbonustorpedovelocitygf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nemesis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonustorpedovelocitymf2.py b/eos/effects/shipbonustorpedovelocitymf2.py
index e74cb86bff..cf5a4385ab 100644
--- a/eos/effects/shipbonustorpedovelocitymf2.py
+++ b/eos/effects/shipbonustorpedovelocitymf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hound
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonusvelocityci.py b/eos/effects/shipbonusvelocityci.py
index ed272f31ab..9f34a3e72d 100644
--- a/eos/effects/shipbonusvelocityci.py
+++ b/eos/effects/shipbonusvelocityci.py
@@ -4,5 +4,7 @@
 # Variations of ship: Tayra (2 of 2)
 # Ship: Crane
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/shipbonusvelocitygi.py b/eos/effects/shipbonusvelocitygi.py
index 5e06833d1a..b032ee1d1f 100644
--- a/eos/effects/shipbonusvelocitygi.py
+++ b/eos/effects/shipbonusvelocitygi.py
@@ -7,6 +7,8 @@
 # Ship: Kryos
 # Ship: Viator
 type = "passive"
+
+
 def handler(fit, ship, context):
     # TODO: investigate if we can live without such ifs or hardcoding
     # Viator doesn't have GI bonus
diff --git a/eos/effects/shipbonuswarpscramblemaxrangegb.py b/eos/effects/shipbonuswarpscramblemaxrangegb.py
index 36586ab3c6..a26ffadbee 100644
--- a/eos/effects/shipbonuswarpscramblemaxrangegb.py
+++ b/eos/effects/shipbonuswarpscramblemaxrangegb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Barghest
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shipbonuswarpscramblermaxrangegc2.py b/eos/effects/shipbonuswarpscramblermaxrangegc2.py
index 34df40cdb2..84afce09b6 100644
--- a/eos/effects/shipbonuswarpscramblermaxrangegc2.py
+++ b/eos/effects/shipbonuswarpscramblermaxrangegc2.py
@@ -4,6 +4,8 @@
 # Ship: Adrestia
 # Ship: Orthrus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipbonuswarpscramblermaxrangegf2.py b/eos/effects/shipbonuswarpscramblermaxrangegf2.py
index 9587eee65d..77fd29e73d 100644
--- a/eos/effects/shipbonuswarpscramblermaxrangegf2.py
+++ b/eos/effects/shipbonuswarpscramblermaxrangegf2.py
@@ -4,6 +4,8 @@
 # Ship: Garmur
 # Ship: Utu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipbonuswdfgnullpenalties.py b/eos/effects/shipbonuswdfgnullpenalties.py
index da395b9b63..0a10507111 100644
--- a/eos/effects/shipbonuswdfgnullpenalties.py
+++ b/eos/effects/shipbonuswdfgnullpenalties.py
@@ -4,6 +4,8 @@
 # Ship: Fiend
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
                                   "speedFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
diff --git a/eos/effects/shipcapitalagilitybonus.py b/eos/effects/shipcapitalagilitybonus.py
index 4d41a83e6a..71c8e0ca44 100644
--- a/eos/effects/shipcapitalagilitybonus.py
+++ b/eos/effects/shipcapitalagilitybonus.py
@@ -8,5 +8,7 @@
 # Ships from group: Titan (5 of 5)
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.multiplyItemAttr("agility", src.getModifiedItemAttr("advancedCapitalAgility"), stackingPenalties=True)
diff --git a/eos/effects/shipcapneedbonusab.py b/eos/effects/shipcapneedbonusab.py
index 696b60ec43..84fb447cc7 100644
--- a/eos/effects/shipcapneedbonusab.py
+++ b/eos/effects/shipcapneedbonusab.py
@@ -4,6 +4,8 @@
 # Variations of ship: Armageddon (3 of 5)
 # Ship: Apocalypse Imperial Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipcappropulsionjamming.py b/eos/effects/shipcappropulsionjamming.py
index 1b3bb08c16..eb349db5c3 100644
--- a/eos/effects/shipcappropulsionjamming.py
+++ b/eos/effects/shipcappropulsionjamming.py
@@ -7,6 +7,8 @@
 # Ship: Executioner
 # Ship: Slasher
 type = "passive"
+
+
 def handler(fit, ship, context):
     groups = ("Stasis Web", "Warp Scrambler")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
diff --git a/eos/effects/shipcaprecharge2af.py b/eos/effects/shipcaprecharge2af.py
index 436742c4f3..5822015f5b 100644
--- a/eos/effects/shipcaprecharge2af.py
+++ b/eos/effects/shipcaprecharge2af.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Anathema
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipcargobonusai.py b/eos/effects/shipcargobonusai.py
index d035e20d82..8e4dcae18b 100644
--- a/eos/effects/shipcargobonusai.py
+++ b/eos/effects/shipcargobonusai.py
@@ -4,5 +4,7 @@
 # Variations of ship: Sigil (2 of 2)
 # Ship: Bestower
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py
index 9a4de1129e..f865e5ea22 100644
--- a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py
+++ b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     if fit.extraAttributes["siege"]:
-        fit.ship.increaseItemAttr("commandBonusEffective", ship.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
+        fit.ship.increaseItemAttr("commandBonusEffective", ship.getModifiedItemAttr("shipBonusORECapital2"),
+                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py
index 8d85bebf52..fd57fb534f 100644
--- a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py
+++ b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Industrial Reconfiguration"),
-                                  "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1"), skill="Capital Industrial Ships")
+                                  "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1"),
+                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py b/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py
index 9faf7b6a45..755ca5caeb 100644
--- a/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py
+++ b/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Widow
 type = "passive"
+
+
 def handler(fit, ship, context):
     affectedGroups = ("Missile Launcher Cruise", "Missile Launcher Torpedo")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
diff --git a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
index e932a7a613..e3b31c683e 100644
--- a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
+++ b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py
@@ -4,6 +4,9 @@
 # Ship: Golem
 # Ship: Widow
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
+        "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/shipcruiselauncherrofbonus2cb.py
index 874ce2cc13..e525b593fa 100644
--- a/eos/effects/shipcruiselauncherrofbonus2cb.py
+++ b/eos/effects/shipcruiselauncherrofbonus2cb.py
@@ -4,6 +4,8 @@
 # Ship: Raven
 # Ship: Raven State Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
                                   "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipcruisemissileaoecloudsize1cb.py b/eos/effects/shipcruisemissileaoecloudsize1cb.py
index 55123d3285..e1d7c25573 100644
--- a/eos/effects/shipcruisemissileaoecloudsize1cb.py
+++ b/eos/effects/shipcruisemissileaoecloudsize1cb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Raven Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipcruisemissilerofcb.py b/eos/effects/shipcruisemissilerofcb.py
index 1818258014..268e7d96a2 100644
--- a/eos/effects/shipcruisemissilerofcb.py
+++ b/eos/effects/shipcruisemissilerofcb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
                                   "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py
index 7d7819cb86..b690761be9 100644
--- a/eos/effects/shipcruisemissilevelocitybonuscb3.py
+++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Raven (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/shipdronemwdspeedbonusrookie.py b/eos/effects/shipdronemwdspeedbonusrookie.py
index 201f905248..0bb5910d91 100644
--- a/eos/effects/shipdronemwdspeedbonusrookie.py
+++ b/eos/effects/shipdronemwdspeedbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda mod: True,
                                  "maxVelocity", ship.getModifiedItemAttr("rookieDroneMWDspeed"))
diff --git a/eos/effects/shipdronescoutthermaldamagegf2.py b/eos/effects/shipdronescoutthermaldamagegf2.py
index 85266c809b..afe18cb9d9 100644
--- a/eos/effects/shipdronescoutthermaldamagegf2.py
+++ b/eos/effects/shipdronescoutthermaldamagegf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Helios
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drone Avionics"),
                                  "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipdronesmaxgc2.py b/eos/effects/shipdronesmaxgc2.py
index 7ae2e2f584..16390827ef 100644
--- a/eos/effects/shipdronesmaxgc2.py
+++ b/eos/effects/shipdronesmaxgc2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Guardian-Vexor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipecmscanstrengthbonuscf.py b/eos/effects/shipecmscanstrengthbonuscf.py
index 544c9854e6..6d16406198 100644
--- a/eos/effects/shipecmscanstrengthbonuscf.py
+++ b/eos/effects/shipecmscanstrengthbonuscf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Griffin (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
diff --git a/eos/effects/shipecmscanstrengthbonusrookie.py b/eos/effects/shipecmscanstrengthbonusrookie.py
index 7ee271baed..312932605e 100644
--- a/eos/effects/shipecmscanstrengthbonusrookie.py
+++ b/eos/effects/shipecmscanstrengthbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ibis
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
diff --git a/eos/effects/shipenergydrainamountaf1.py b/eos/effects/shipenergydrainamountaf1.py
index 21239c0394..8dc8e60bc1 100644
--- a/eos/effects/shipenergydrainamountaf1.py
+++ b/eos/effects/shipenergydrainamountaf1.py
@@ -4,6 +4,8 @@
 # Ship: Cruor
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusab.py b/eos/effects/shipenergyneutralizertransferamountbonusab.py
index a331c58d4e..c814b51b54 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusab.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusab.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Bhaalgorn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"),
+                                  skill="Amarr Battleship")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusac.py b/eos/effects/shipenergyneutralizertransferamountbonusac.py
index 58fb9bb962..4dfc4dc874 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusac.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusac.py
@@ -4,6 +4,9 @@
 # Ship: Ashimmu
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAC"),
+                                  skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf.py b/eos/effects/shipenergyneutralizertransferamountbonusaf.py
index 11116d5a27..e8f6ec3aaf 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusaf.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusaf.py
@@ -4,6 +4,9 @@
 # Ship: Cruor
 # Ship: Sentinel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAF"),
+                                  skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
index 16c62b8a1c..529e6651e9 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonus2AF"),
+                                  skill="Amarr Frigate")
diff --git a/eos/effects/shipenergytcapneedbonusaf.py b/eos/effects/shipenergytcapneedbonusaf.py
index b40fa69fb4..ecac0f30ce 100644
--- a/eos/effects/shipenergytcapneedbonusaf.py
+++ b/eos/effects/shipenergytcapneedbonusaf.py
@@ -9,6 +9,8 @@
 # Ship: Silver Magnate
 # Ship: Tormentor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergytcapneedbonusrookie.py b/eos/effects/shipenergytcapneedbonusrookie.py
index 282f1df226..4372da1046 100644
--- a/eos/effects/shipenergytcapneedbonusrookie.py
+++ b/eos/effects/shipenergytcapneedbonusrookie.py
@@ -4,6 +4,8 @@
 # Ship: Hematos
 # Ship: Impairor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "capacitorNeed", ship.getModifiedItemAttr("rookieSETCapBonus"))
diff --git a/eos/effects/shipenergytrackingabc1.py b/eos/effects/shipenergytrackingabc1.py
index 3384bdee58..f88ec12de8 100644
--- a/eos/effects/shipenergytrackingabc1.py
+++ b/eos/effects/shipenergytrackingabc1.py
@@ -4,6 +4,9 @@
 # Ship: Harbinger Navy Issue
 
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shipenergytransferrange1.py b/eos/effects/shipenergytransferrange1.py
index 7a8182c86f..95b5cac92b 100644
--- a/eos/effects/shipenergytransferrange1.py
+++ b/eos/effects/shipenergytransferrange1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergytransferrange2.py b/eos/effects/shipenergytransferrange2.py
index a80259cb23..3f65366f28 100644
--- a/eos/effects/shipenergytransferrange2.py
+++ b/eos/effects/shipenergytransferrange2.py
@@ -4,6 +4,8 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipenergyvampireamountbonusfixedaf2.py b/eos/effects/shipenergyvampireamountbonusfixedaf2.py
index 09ca0424dc..e48b89b061 100644
--- a/eos/effects/shipenergyvampireamountbonusfixedaf2.py
+++ b/eos/effects/shipenergyvampireamountbonusfixedaf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Malice
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
+                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"),
+                                  skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyvampiretransferamountbonusab.py b/eos/effects/shipenergyvampiretransferamountbonusab.py
index 012d52331a..288f216093 100644
--- a/eos/effects/shipenergyvampiretransferamountbonusab.py
+++ b/eos/effects/shipenergyvampiretransferamountbonusab.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Bhaalgorn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
+                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"),
+                                  skill="Amarr Battleship")
diff --git a/eos/effects/shipenergyvampiretransferamountbonusac.py b/eos/effects/shipenergyvampiretransferamountbonusac.py
index e7bb688621..71f2d5a67b 100644
--- a/eos/effects/shipenergyvampiretransferamountbonusac.py
+++ b/eos/effects/shipenergyvampiretransferamountbonusac.py
@@ -4,6 +4,8 @@
 # Ship: Ashimmu
 # Ship: Vangel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/shipetdamageaf.py
index 4be3ab94cf..bc11bd6b9f 100644
--- a/eos/effects/shipetdamageaf.py
+++ b/eos/effects/shipetdamageaf.py
@@ -5,5 +5,8 @@
 # Ship: Crusader
 # Ship: Imperial Navy Slicer
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipetoptimalrange2af.py b/eos/effects/shipetoptimalrange2af.py
index 593ee452fb..49602fd47b 100644
--- a/eos/effects/shipetoptimalrange2af.py
+++ b/eos/effects/shipetoptimalrange2af.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Imperial Navy Slicer
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipetspeedbonusab2.py b/eos/effects/shipetspeedbonusab2.py
index ccec8f55f5..73ffd229d0 100644
--- a/eos/effects/shipetspeedbonusab2.py
+++ b/eos/effects/shipetspeedbonusab2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Armageddon (3 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
\ No newline at end of file
+                                  "speed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipfalloffbonusgf.py b/eos/effects/shipfalloffbonusgf.py
index 177b5695ec..09fbcf7e73 100644
--- a/eos/effects/shipfalloffbonusgf.py
+++ b/eos/effects/shipfalloffbonusgf.py
@@ -4,6 +4,8 @@
 # Ship: Atron
 # Ship: Daredevil
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/shipfalloffbonusmf.py b/eos/effects/shipfalloffbonusmf.py
index 25be55819c..39ec4e71d2 100644
--- a/eos/effects/shipfalloffbonusmf.py
+++ b/eos/effects/shipfalloffbonusmf.py
@@ -4,6 +4,8 @@
 # Ship: Chremoas
 # Ship: Dramiel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipfighterbomberdamagepiratesupercarrier.py b/eos/effects/shipfighterbomberdamagepiratesupercarrier.py
index 2bea423f5e..e19eb7df1a 100644
--- a/eos/effects/shipfighterbomberdamagepiratesupercarrier.py
+++ b/eos/effects/shipfighterbomberdamagepiratesupercarrier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Supercarrier (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipfighterbomberhitpointspiratesupercarrier.py b/eos/effects/shipfighterbomberhitpointspiratesupercarrier.py
index 03416d5f42..d54369c319 100644
--- a/eos/effects/shipfighterbomberhitpointspiratesupercarrier.py
+++ b/eos/effects/shipfighterbomberhitpointspiratesupercarrier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Supercarrier (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
diff --git a/eos/effects/shipfighterdamagepiratesupercarrier.py b/eos/effects/shipfighterdamagepiratesupercarrier.py
index 485db254b0..e4321a4d67 100644
--- a/eos/effects/shipfighterdamagepiratesupercarrier.py
+++ b/eos/effects/shipfighterdamagepiratesupercarrier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Supercarrier (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipfighterhitpointspiratesupercarrier.py b/eos/effects/shipfighterhitpointspiratesupercarrier.py
index 14b4f888b7..c184f8b320 100644
--- a/eos/effects/shipfighterhitpointspiratesupercarrier.py
+++ b/eos/effects/shipfighterhitpointspiratesupercarrier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships from group: Supercarrier (5 of 5)
 type = "passive"
+
+
 def handler(fit, ship, context):
     for type in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
diff --git a/eos/effects/shipgchyieldbonusorefrig2.py b/eos/effects/shipgchyieldbonusorefrig2.py
index ce9cdbe44a..23749fa440 100644
--- a/eos/effects/shipgchyieldbonusorefrig2.py
+++ b/eos/effects/shipgchyieldbonusorefrig2.py
@@ -4,6 +4,8 @@
 # Ship: Prospect
 # Ship: Venture
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
                                   "duration", module.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
index 2a758f92b0..60007905d3 100644
--- a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
+++ b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Confessor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3"), skill="Amarr Tactical Destroyer")
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3"),
+                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py b/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py
index 488035544e..afe1aa44d2 100644
--- a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py
+++ b/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Jackdaw
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3"), skill="Caldari Tactical Destroyer")
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3"),
+                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/shipheatdamagegallentetacticaldestroyer3.py b/eos/effects/shipheatdamagegallentetacticaldestroyer3.py
index 7bbad6ac39..b5854c3fbb 100644
--- a/eos/effects/shipheatdamagegallentetacticaldestroyer3.py
+++ b/eos/effects/shipheatdamagegallentetacticaldestroyer3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hecate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3"), skill="Gallente Tactical Destroyer")
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3"),
+                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py
index 53ef8c9835..30b0d22fbc 100644
--- a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py
+++ b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Svipul
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3"), skill="Minmatar Tactical Destroyer")
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3"),
+                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py b/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py
index 43b6fa99c7..2ef68bd9f1 100644
--- a/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py
+++ b/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Drake Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
+                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
+                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py b/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py
index be654846f4..f9cbb40c39 100644
--- a/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py
+++ b/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Caracal Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py b/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py
index 9b722170da..c75875c245 100644
--- a/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py
+++ b/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py
@@ -3,8 +3,11 @@
 # Used by:
 # Ship: Sacrilege
 type = "passive"
+
+
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAC"),
+                                        skill="Amarr Cruiser")
diff --git a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
index d491106904..50aecade1f 100644
--- a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
index 27b2a0f841..089ec066be 100644
--- a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py b/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
index bd9d667d8e..81706525a9 100644
--- a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
index 0e441c5cab..15d354e638 100644
--- a/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavymissileaoecloudsizecbc1.py b/eos/effects/shipheavymissileaoecloudsizecbc1.py
index b752147db8..e7046f2adc 100644
--- a/eos/effects/shipheavymissileaoecloudsizecbc1.py
+++ b/eos/effects/shipheavymissileaoecloudsizecbc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Drake Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
+                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
+                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipheavymissileaoecloudsizecc2.py b/eos/effects/shipheavymissileaoecloudsizecc2.py
index d9e4f36e5e..971e15bae2 100644
--- a/eos/effects/shipheavymissileaoecloudsizecc2.py
+++ b/eos/effects/shipheavymissileaoecloudsizecc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Caracal Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipheavymissileemdmgpiratecruiser.py b/eos/effects/shipheavymissileemdmgpiratecruiser.py
index 5cf9a6bc4b..567d8a110e 100644
--- a/eos/effects/shipheavymissileemdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissileemdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavymissileexpdmgpiratecruiser.py b/eos/effects/shipheavymissileexpdmgpiratecruiser.py
index c03c2deeef..b2f3179cb8 100644
--- a/eos/effects/shipheavymissileexpdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissileexpdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavymissilekindmgpiratecruiser.py b/eos/effects/shipheavymissilekindmgpiratecruiser.py
index bbb6d6358c..0d3543ddd5 100644
--- a/eos/effects/shipheavymissilekindmgpiratecruiser.py
+++ b/eos/effects/shipheavymissilekindmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipheavymissilethermdmgpiratecruiser.py b/eos/effects/shipheavymissilethermdmgpiratecruiser.py
index 54e5bb5efe..f50b057714 100644
--- a/eos/effects/shipheavymissilethermdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissilethermdmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shiphrangebonuscc.py b/eos/effects/shiphrangebonuscc.py
index bf9572d39f..644ee7a889 100644
--- a/eos/effects/shiphrangebonuscc.py
+++ b/eos/effects/shiphrangebonuscc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Eagle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shiphtdamagebonuscc.py b/eos/effects/shiphtdamagebonuscc.py
index 4c315d5583..1cc54e2c77 100644
--- a/eos/effects/shiphtdamagebonuscc.py
+++ b/eos/effects/shiphtdamagebonuscc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Moa
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py
index 1268a1938e..39ebd7b330 100644
--- a/eos/effects/shiphtdmgbonusfixedgc.py
+++ b/eos/effects/shiphtdmgbonusfixedgc.py
@@ -9,6 +9,8 @@
 # Ship: Thorax
 # Ship: Vexor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/shiphtdmgbonusgb.py
index 3921d7ea2f..100ac123b0 100644
--- a/eos/effects/shiphtdmgbonusgb.py
+++ b/eos/effects/shiphtdmgbonusgb.py
@@ -7,6 +7,9 @@
 # Ship: Megathron Federate Issue
 # Ship: Sin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB"),
+                                  skill="Gallente Battleship")
diff --git a/eos/effects/shiphttrackingbonusgb.py b/eos/effects/shiphttrackingbonusgb.py
index fdc2fd40dd..60c79d649e 100644
--- a/eos/effects/shiphttrackingbonusgb.py
+++ b/eos/effects/shiphttrackingbonusgb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vindicator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py
index 183f69931e..b64d66c6ba 100644
--- a/eos/effects/shiphttrackingbonusgb2.py
+++ b/eos/effects/shiphttrackingbonusgb2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships named like: Megathron (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2"),
+                                  skill="Gallente Battleship")
diff --git a/eos/effects/shiphturretfalloffbonusgc.py b/eos/effects/shiphturretfalloffbonusgc.py
index 836c1a921e..78e2987cf7 100644
--- a/eos/effects/shiphturretfalloffbonusgc.py
+++ b/eos/effects/shiphturretfalloffbonusgc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vigilant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shiphybriddamagebonuscbc2.py b/eos/effects/shiphybriddamagebonuscbc2.py
index 8bdc20cba6..50f4304ce5 100644
--- a/eos/effects/shiphybriddamagebonuscbc2.py
+++ b/eos/effects/shiphybriddamagebonuscbc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Naga
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
+                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/shiphybriddamagebonuscf.py b/eos/effects/shiphybriddamagebonuscf.py
index 6c514a895d..a10dafe765 100644
--- a/eos/effects/shiphybriddamagebonuscf.py
+++ b/eos/effects/shiphybriddamagebonuscf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Raptor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
\ No newline at end of file
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/shiphybriddamagebonuscf2.py
index 6a579df624..3ea6ddc9fa 100644
--- a/eos/effects/shiphybriddamagebonuscf2.py
+++ b/eos/effects/shiphybriddamagebonuscf2.py
@@ -4,6 +4,8 @@
 # Ship: Griffin Navy Issue
 # Ship: Merlin
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shiphybriddamagebonusgbc2.py b/eos/effects/shiphybriddamagebonusgbc2.py
index 9745804a88..7ae28ba58d 100644
--- a/eos/effects/shiphybriddamagebonusgbc2.py
+++ b/eos/effects/shiphybriddamagebonusgbc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Talos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2"),
+                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/shiphybriddmg1cbc2.py b/eos/effects/shiphybriddmg1cbc2.py
index 82b916baa6..825685ea13 100644
--- a/eos/effects/shiphybriddmg1cbc2.py
+++ b/eos/effects/shiphybriddmg1cbc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Ferox
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
+                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/shiphybriddmg1gbc1.py b/eos/effects/shiphybriddmg1gbc1.py
index 71be2a3e86..d99d40c265 100644
--- a/eos/effects/shiphybriddmg1gbc1.py
+++ b/eos/effects/shiphybriddmg1gbc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Brutix (3 of 3)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
+                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/shiphybriddmgpiratebattleship.py b/eos/effects/shiphybriddmgpiratebattleship.py
index 211a1375ec..dd959b187c 100644
--- a/eos/effects/shiphybriddmgpiratebattleship.py
+++ b/eos/effects/shiphybriddmgpiratebattleship.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vindicator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shiphybriddmgpiratecruiser.py b/eos/effects/shiphybriddmgpiratecruiser.py
index 3ce9f855ac..b0987b4b4b 100644
--- a/eos/effects/shiphybriddmgpiratecruiser.py
+++ b/eos/effects/shiphybriddmgpiratecruiser.py
@@ -4,6 +4,8 @@
 # Ship: Gnosis
 # Ship: Vigilant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/shiphybridfalloff1gd1.py
index c81bc6a0f7..69a04334dc 100644
--- a/eos/effects/shiphybridfalloff1gd1.py
+++ b/eos/effects/shiphybridfalloff1gd1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Catalyst
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shiphybridoptimal1cbc1.py b/eos/effects/shiphybridoptimal1cbc1.py
index 54bec4ce6d..28f6a8c2ef 100644
--- a/eos/effects/shiphybridoptimal1cbc1.py
+++ b/eos/effects/shiphybridoptimal1cbc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Ferox (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shiphybridoptimalgd1.py b/eos/effects/shiphybridoptimalgd1.py
index 3ba0cb846f..0124b48cda 100644
--- a/eos/effects/shiphybridoptimalgd1.py
+++ b/eos/effects/shiphybridoptimalgd1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Eris
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/shiphybridrange1cd1.py b/eos/effects/shiphybridrange1cd1.py
index fc6588175a..ea35b97854 100644
--- a/eos/effects/shiphybridrange1cd1.py
+++ b/eos/effects/shiphybridrange1cd1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cormorant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shiphybridrangebonuscbc1.py b/eos/effects/shiphybridrangebonuscbc1.py
index 36bce02823..ec1572d8ba 100644
--- a/eos/effects/shiphybridrangebonuscbc1.py
+++ b/eos/effects/shiphybridrangebonuscbc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Naga
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shiphybridrangebonuscf2.py b/eos/effects/shiphybridrangebonuscf2.py
index 2823c2a650..08e85c17cd 100644
--- a/eos/effects/shiphybridrangebonuscf2.py
+++ b/eos/effects/shiphybridrangebonuscf2.py
@@ -4,6 +4,8 @@
 # Ship: Harpy
 # Ship: Raptor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shiphybridrangebonusrookie.py b/eos/effects/shiphybridrangebonusrookie.py
index f192be4641..417e8cc671 100644
--- a/eos/effects/shiphybridrangebonusrookie.py
+++ b/eos/effects/shiphybridrangebonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ibis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSHTOptimalBonus"))
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("rookieSHTOptimalBonus"))
diff --git a/eos/effects/shiphybridtracking1gd2.py b/eos/effects/shiphybridtracking1gd2.py
index 0bd5a3fac2..029dfaa35b 100644
--- a/eos/effects/shiphybridtracking1gd2.py
+++ b/eos/effects/shiphybridtracking1gd2.py
@@ -4,6 +4,8 @@
 # Variations of ship: Catalyst (2 of 2)
 # Ship: Algos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/shiphybridtrackingcd2.py b/eos/effects/shiphybridtrackingcd2.py
index 151686d6d4..20dc8ef346 100644
--- a/eos/effects/shiphybridtrackingcd2.py
+++ b/eos/effects/shiphybridtrackingcd2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cormorant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/shiphybridtrackinggbc2.py b/eos/effects/shiphybridtrackinggbc2.py
index 3dd3299163..ee9309f0ad 100644
--- a/eos/effects/shiphybridtrackinggbc2.py
+++ b/eos/effects/shiphybridtrackinggbc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Brutix Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2"),
+                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/shiphybridtrackinggc.py b/eos/effects/shiphybridtrackinggc.py
index 53dddd898b..e6708839ec 100644
--- a/eos/effects/shiphybridtrackinggc.py
+++ b/eos/effects/shiphybridtrackinggc.py
@@ -4,6 +4,8 @@
 # Ship: Lachesis
 # Ship: Phobos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shiphybridtrackinggc2.py b/eos/effects/shiphybridtrackinggc2.py
index b90f1fa229..5f2eac55a0 100644
--- a/eos/effects/shiphybridtrackinggc2.py
+++ b/eos/effects/shiphybridtrackinggc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Thorax
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shiphybridturretrofbonusgc2.py b/eos/effects/shiphybridturretrofbonusgc2.py
index f056662557..ab847b6851 100644
--- a/eos/effects/shiphybridturretrofbonusgc2.py
+++ b/eos/effects/shiphybridturretrofbonusgc2.py
@@ -4,6 +4,8 @@
 # Ship: Exequror Navy Issue
 # Ship: Phobos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shiplargehybridtrackingbonusgbc1.py b/eos/effects/shiplargehybridtrackingbonusgbc1.py
index 0a6349db2d..ed177a5c9c 100644
--- a/eos/effects/shiplargehybridtrackingbonusgbc1.py
+++ b/eos/effects/shiplargehybridtrackingbonusgbc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Talos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1"),
+                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/shiplargehybridturretrofgb.py
index cbd73aca33..51045e22f5 100644
--- a/eos/effects/shiplargehybridturretrofgb.py
+++ b/eos/effects/shiplargehybridturretrofgb.py
@@ -4,6 +4,8 @@
 # Ship: Megathron
 # Ship: Megathron Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shiplargelasercapabc1.py b/eos/effects/shiplargelasercapabc1.py
index 5f25cc664e..facc0461df 100644
--- a/eos/effects/shiplargelasercapabc1.py
+++ b/eos/effects/shiplargelasercapabc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oracle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiplargelaserdamagebonusabc2.py b/eos/effects/shiplargelaserdamagebonusabc2.py
index 97f8a00ab4..ced27165bb 100644
--- a/eos/effects/shiplargelaserdamagebonusabc2.py
+++ b/eos/effects/shiplargelaserdamagebonusabc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Oracle
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiplasercap1abc2.py b/eos/effects/shiplasercap1abc2.py
index 4041e972df..6517f63511 100644
--- a/eos/effects/shiplasercap1abc2.py
+++ b/eos/effects/shiplasercap1abc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Absolution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiplasercapabc1.py b/eos/effects/shiplasercapabc1.py
index a6bbcc1750..e733f37093 100644
--- a/eos/effects/shiplasercapabc1.py
+++ b/eos/effects/shiplasercapabc1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Harbinger
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser")
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiplasercapneed2ad1.py b/eos/effects/shiplasercapneed2ad1.py
index 749a631d79..ae8265d4fc 100644
--- a/eos/effects/shiplasercapneed2ad1.py
+++ b/eos/effects/shiplasercapneed2ad1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Coercer
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shiplaserdamagebonusabc2.py b/eos/effects/shiplaserdamagebonusabc2.py
index 5fadbd6049..c750cbd31a 100644
--- a/eos/effects/shiplaserdamagebonusabc2.py
+++ b/eos/effects/shiplaserdamagebonusabc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ships named like: Harbinger (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
+                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/shiplaserdamagepiratebattleship.py b/eos/effects/shiplaserdamagepiratebattleship.py
index d5f48b3230..7625b23833 100644
--- a/eos/effects/shiplaserdamagepiratebattleship.py
+++ b/eos/effects/shiplaserdamagepiratebattleship.py
@@ -4,6 +4,8 @@
 # Ship: Bhaalgorn
 # Ship: Nightmare
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shiplaserrofac2.py b/eos/effects/shiplaserrofac2.py
index c5b18f0107..dbb11d7796 100644
--- a/eos/effects/shiplaserrofac2.py
+++ b/eos/effects/shiplaserrofac2.py
@@ -4,6 +4,8 @@
 # Ship: Omen
 # Ship: Zealot
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shiplasertracking2ad2.py b/eos/effects/shiplasertracking2ad2.py
index 6d751cfdaf..03f58cb78e 100644
--- a/eos/effects/shiplasertracking2ad2.py
+++ b/eos/effects/shiplasertracking2ad2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Coercer
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shiplightmissilemaxvelocitybonusrookie.py b/eos/effects/shiplightmissilemaxvelocitybonusrookie.py
index 144f59edb8..9d3630a61d 100644
--- a/eos/effects/shiplightmissilemaxvelocitybonusrookie.py
+++ b/eos/effects/shiplightmissilemaxvelocitybonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("rookieLightMissileVelocity"))
diff --git a/eos/effects/shipmaxlockedtargetsbonusaddonline.py b/eos/effects/shipmaxlockedtargetsbonusaddonline.py
index 69d7e48cb2..5e33906ff3 100644
--- a/eos/effects/shipmaxlockedtargetsbonusaddonline.py
+++ b/eos/effects/shipmaxlockedtargetsbonusaddonline.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/shipmaxtargetrangebonusonline.py b/eos/effects/shipmaxtargetrangebonusonline.py
index 48a6d92e1a..5202306686 100644
--- a/eos/effects/shipmaxtargetrangebonusonline.py
+++ b/eos/effects/shipmaxtargetrangebonusonline.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/shipmetcdamagebonusac.py b/eos/effects/shipmetcdamagebonusac.py
index 7e0a512526..485d714572 100644
--- a/eos/effects/shipmetcdamagebonusac.py
+++ b/eos/effects/shipmetcdamagebonusac.py
@@ -5,6 +5,8 @@
 # Ship: Maller
 # Ship: Omen Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipmetdamagebonusac2.py b/eos/effects/shipmetdamagebonusac2.py
index 9e356bfb0e..d8b44d2b82 100644
--- a/eos/effects/shipmetdamagebonusac2.py
+++ b/eos/effects/shipmetdamagebonusac2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Devoter
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipminingbonusorefrig1.py b/eos/effects/shipminingbonusorefrig1.py
index c67495295a..ca0981dc77 100644
--- a/eos/effects/shipminingbonusorefrig1.py
+++ b/eos/effects/shipminingbonusorefrig1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Venture (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1"), skill="Mining Frigate")
+                                  "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1"),
+                                  skill="Mining Frigate")
diff --git a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
index f384e3b833..b66bb9cac3 100644
--- a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
+++ b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py
@@ -4,6 +4,8 @@
 # Ship: Caracal
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissileemdamagecb.py b/eos/effects/shipmissileemdamagecb.py
index 43869cffae..855ce53f4e 100644
--- a/eos/effects/shipmissileemdamagecb.py
+++ b/eos/effects/shipmissileemdamagecb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Barghest
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipmissileemdamagecc.py b/eos/effects/shipmissileemdamagecc.py
index 484ed5b38a..4fb4931606 100644
--- a/eos/effects/shipmissileemdamagecc.py
+++ b/eos/effects/shipmissileemdamagecc.py
@@ -4,6 +4,8 @@
 # Ship: Orthrus
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissileemdamagecf2.py b/eos/effects/shipmissileemdamagecf2.py
index 0b6ef4a07e..62e2e0fb3f 100644
--- a/eos/effects/shipmissileemdamagecf2.py
+++ b/eos/effects/shipmissileemdamagecf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Garmur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissileexpdamagecc.py b/eos/effects/shipmissileexpdamagecc.py
index 1e0a584c65..4ba61cc887 100644
--- a/eos/effects/shipmissileexpdamagecc.py
+++ b/eos/effects/shipmissileexpdamagecc.py
@@ -4,6 +4,8 @@
 # Ship: Orthrus
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissileexplodamagecb.py b/eos/effects/shipmissileexplodamagecb.py
index 73deda312b..0d5a3a588d 100644
--- a/eos/effects/shipmissileexplodamagecb.py
+++ b/eos/effects/shipmissileexplodamagecb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Barghest
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB"),
+                                    skill="Caldari Battleship")
diff --git a/eos/effects/shipmissileexplosivedamagecf2.py b/eos/effects/shipmissileexplosivedamagecf2.py
index 9290e691ff..ba61d0f476 100644
--- a/eos/effects/shipmissileexplosivedamagecf2.py
+++ b/eos/effects/shipmissileexplosivedamagecf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Garmur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"),
+                                    skill="Caldari Frigate")
diff --git a/eos/effects/shipmissileheavyassaultvelocityabc2.py b/eos/effects/shipmissileheavyassaultvelocityabc2.py
index 39eb421b10..a43ad0c440 100644
--- a/eos/effects/shipmissileheavyassaultvelocityabc2.py
+++ b/eos/effects/shipmissileheavyassaultvelocityabc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Damnation
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
+                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/shipmissileheavyvelocityabc2.py b/eos/effects/shipmissileheavyvelocityabc2.py
index 2a6d1cd08b..a2cfa0befb 100644
--- a/eos/effects/shipmissileheavyvelocityabc2.py
+++ b/eos/effects/shipmissileheavyvelocityabc2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Damnation
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
+                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/shipmissileheavyvelocitybonuscc2.py b/eos/effects/shipmissileheavyvelocitybonuscc2.py
index 23a0d49c2f..aaf6de930b 100644
--- a/eos/effects/shipmissileheavyvelocitybonuscc2.py
+++ b/eos/effects/shipmissileheavyvelocitybonuscc2.py
@@ -4,6 +4,8 @@
 # Ship: Caracal
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilekindamagecb.py b/eos/effects/shipmissilekindamagecb.py
index 49b58f3074..32d10f8f56 100644
--- a/eos/effects/shipmissilekindamagecb.py
+++ b/eos/effects/shipmissilekindamagecb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Barghest
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCB"),
+                                    skill="Caldari Battleship")
diff --git a/eos/effects/shipmissilekindamagecc2.py b/eos/effects/shipmissilekindamagecc2.py
index 78a95f84e3..2a9b2ef964 100644
--- a/eos/effects/shipmissilekindamagecc2.py
+++ b/eos/effects/shipmissilekindamagecc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Rook
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilekindamagecc3.py b/eos/effects/shipmissilekindamagecc3.py
index e1958c3085..e78580e802 100644
--- a/eos/effects/shipmissilekindamagecc3.py
+++ b/eos/effects/shipmissilekindamagecc3.py
@@ -4,5 +4,8 @@
 # Ship: Osprey Navy Issue
 
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("shipBonusCC3"), skill="Caldari Cruiser")
\ No newline at end of file
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusCC3"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilekineticdamagecc.py b/eos/effects/shipmissilekineticdamagecc.py
index c0b145770f..e656053e6c 100644
--- a/eos/effects/shipmissilekineticdamagecc.py
+++ b/eos/effects/shipmissilekineticdamagecc.py
@@ -5,6 +5,8 @@
 # Ship: Onyx
 # Ship: Orthrus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/shipmissilekineticdamagecf.py
index 665c22f844..3718e1666e 100644
--- a/eos/effects/shipmissilekineticdamagecf.py
+++ b/eos/effects/shipmissilekineticdamagecf.py
@@ -5,6 +5,8 @@
 # Ship: Condor
 # Ship: Hawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilekineticdamagecf2.py b/eos/effects/shipmissilekineticdamagecf2.py
index c5a2c0f0a9..c5a047761d 100644
--- a/eos/effects/shipmissilekineticdamagecf2.py
+++ b/eos/effects/shipmissilekineticdamagecf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Garmur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilekineticdamagerookie.py b/eos/effects/shipmissilekineticdamagerookie.py
index dd9e1f1ee5..4ab3523449 100644
--- a/eos/effects/shipmissilekineticdamagerookie.py
+++ b/eos/effects/shipmissilekineticdamagerookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ibis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "kineticDamage", ship.getModifiedItemAttr("rookieMissileKinDamageBonus"))
diff --git a/eos/effects/shipmissilelauncherrofad1fixed.py b/eos/effects/shipmissilelauncherrofad1fixed.py
index 7c28cce645..37b8abfc74 100644
--- a/eos/effects/shipmissilelauncherrofad1fixed.py
+++ b/eos/effects/shipmissilelauncherrofad1fixed.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Heretic
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
\ No newline at end of file
+                                  "speed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipmissilelauncherrofcc2.py b/eos/effects/shipmissilelauncherrofcc2.py
index a73513db60..1c1ce33d4d 100644
--- a/eos/effects/shipmissilelauncherrofcc2.py
+++ b/eos/effects/shipmissilelauncherrofcc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Onyx
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                   "speed", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilelauncherspeedbonusmc2.py b/eos/effects/shipmissilelauncherspeedbonusmc2.py
index 93c9bb262d..b070d3b2c0 100644
--- a/eos/effects/shipmissilelauncherspeedbonusmc2.py
+++ b/eos/effects/shipmissilelauncherspeedbonusmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Bellicose
 type = "passive"
+
+
 def handler(fit, ship, context):
     groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy", "Missile Launcher Heavy Assault")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
diff --git a/eos/effects/shipmissilelightvelocitybonuscc2.py b/eos/effects/shipmissilelightvelocitybonuscc2.py
index 5c746a81d5..32a307ef83 100644
--- a/eos/effects/shipmissilelightvelocitybonuscc2.py
+++ b/eos/effects/shipmissilelightvelocitybonuscc2.py
@@ -4,6 +4,8 @@
 # Ship: Caracal
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py b/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py
index f135240bf2..7dbed24423 100644
--- a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py
+++ b/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Jackdaw
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2"), skill="Caldari Tactical Destroyer")
+                                  "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2"),
+                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py b/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py
index 9bb6ba9795..f0d7c29268 100644
--- a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py
+++ b/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py
@@ -3,8 +3,9 @@
 # Used by:
 # Ship: Jackdaw
 type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1"), skill="Caldari Tactical Destroyer")
 
 
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
+                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1"),
+                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/shipmissilerofcc.py
index 933fe04ac9..785726f9c8 100644
--- a/eos/effects/shipmissilerofcc.py
+++ b/eos/effects/shipmissilerofcc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ships named like: Caracal (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
diff --git a/eos/effects/shipmissilerofmf2.py b/eos/effects/shipmissilerofmf2.py
index 04ac24d596..140e856dbc 100644
--- a/eos/effects/shipmissilerofmf2.py
+++ b/eos/effects/shipmissilerofmf2.py
@@ -3,8 +3,8 @@
 # Used by:
 # Ship: Breacher
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                   "speed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-
-
diff --git a/eos/effects/shipmissilespeedbonusaf.py b/eos/effects/shipmissilespeedbonusaf.py
index 39dfb807fc..b99ef42a40 100644
--- a/eos/effects/shipmissilespeedbonusaf.py
+++ b/eos/effects/shipmissilespeedbonusaf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                   "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipmissilespeedbonuscf.py b/eos/effects/shipmissilespeedbonuscf.py
index 5351d8045c..c73d8a7dbc 100644
--- a/eos/effects/shipmissilespeedbonuscf.py
+++ b/eos/effects/shipmissilespeedbonuscf.py
@@ -4,6 +4,8 @@
 # Ship: Buzzard
 # Ship: Hawk
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
                                   "speed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilethermaldamagecf2.py b/eos/effects/shipmissilethermaldamagecf2.py
index 80af650d9f..c61c29ee1b 100644
--- a/eos/effects/shipmissilethermaldamagecf2.py
+++ b/eos/effects/shipmissilethermaldamagecf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Garmur
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilethermdamagecb.py b/eos/effects/shipmissilethermdamagecb.py
index 6a6dde8b8f..ccf2ec27ed 100644
--- a/eos/effects/shipmissilethermdamagecb.py
+++ b/eos/effects/shipmissilethermdamagecb.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Barghest
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCB"),
+                                    skill="Caldari Battleship")
diff --git a/eos/effects/shipmissilethermdamagecc.py b/eos/effects/shipmissilethermdamagecc.py
index 6bef70ccf5..175af52660 100644
--- a/eos/effects/shipmissilethermdamagecc.py
+++ b/eos/effects/shipmissilethermdamagecc.py
@@ -4,6 +4,8 @@
 # Ship: Orthrus
 # Ship: Osprey Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipmissilevelocitycd1.py b/eos/effects/shipmissilevelocitycd1.py
index 5456686066..370f666b2f 100644
--- a/eos/effects/shipmissilevelocitycd1.py
+++ b/eos/effects/shipmissilevelocitycd1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Flycatcher
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/shipmissilevelocitycf.py b/eos/effects/shipmissilevelocitycf.py
index 3bb7fe4c62..1e884505d6 100644
--- a/eos/effects/shipmissilevelocitycf.py
+++ b/eos/effects/shipmissilevelocitycf.py
@@ -5,6 +5,8 @@
 # Ship: Crow
 # Ship: Kestrel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilevelocitypiratefactionfrigate.py b/eos/effects/shipmissilevelocitypiratefactionfrigate.py
index c22cfb6ca5..4e4e03685e 100644
--- a/eos/effects/shipmissilevelocitypiratefactionfrigate.py
+++ b/eos/effects/shipmissilevelocitypiratefactionfrigate.py
@@ -5,6 +5,8 @@
 # Ship: Garmur
 # Ship: Orthrus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipmissilevelocitypiratefactionlight.py b/eos/effects/shipmissilevelocitypiratefactionlight.py
index 3e073e3a27..ece99d75b9 100644
--- a/eos/effects/shipmissilevelocitypiratefactionlight.py
+++ b/eos/effects/shipmissilevelocitypiratefactionlight.py
@@ -4,6 +4,8 @@
 # Ship: Corax
 # Ship: Talwar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipmissilevelocitypiratefactionrocket.py b/eos/effects/shipmissilevelocitypiratefactionrocket.py
index 0f181ed664..23cf6f34bf 100644
--- a/eos/effects/shipmissilevelocitypiratefactionrocket.py
+++ b/eos/effects/shipmissilevelocitypiratefactionrocket.py
@@ -4,6 +4,8 @@
 # Ship: Corax
 # Ship: Talwar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/shipmodemaxtargetrangepostdiv.py
index e38ed8dfeb..d6f46f4280 100644
--- a/eos/effects/shipmodemaxtargetrangepostdiv.py
+++ b/eos/effects/shipmodemaxtargetrangepostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Sharpshooter Mode (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(
         "maxTargetRange",
diff --git a/eos/effects/shipmodemissilevelocitypostdiv.py b/eos/effects/shipmodemissilevelocitypostdiv.py
index e713dd801f..994a5bf74c 100644
--- a/eos/effects/shipmodemissilevelocitypostdiv.py
+++ b/eos/effects/shipmodemissilevelocitypostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Jackdaw Sharpshooter Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeMultiply(
         lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
diff --git a/eos/effects/shipmodescanrespostdiv.py b/eos/effects/shipmodescanrespostdiv.py
index f89c8152fd..fd156dee4f 100644
--- a/eos/effects/shipmodescanrespostdiv.py
+++ b/eos/effects/shipmodescanrespostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Sharpshooter Mode (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr(
         "scanResolution",
diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/shipmodescanstrengthpostdiv.py
index eac3f8b612..544eac1b28 100644
--- a/eos/effects/shipmodescanstrengthpostdiv.py
+++ b/eos/effects/shipmodescanstrengthpostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Sharpshooter Mode (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         fit.ship.multiplyItemAttr(
diff --git a/eos/effects/shipmodesetoptimalrangepostdiv.py b/eos/effects/shipmodesetoptimalrangepostdiv.py
index a4aadbee87..4279bc1678 100644
--- a/eos/effects/shipmodesetoptimalrangepostdiv.py
+++ b/eos/effects/shipmodesetoptimalrangepostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Confessor Sharpshooter Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("Small Energy Turret"),
diff --git a/eos/effects/shipmodeshtoptimalrangepostdiv.py b/eos/effects/shipmodeshtoptimalrangepostdiv.py
index 4b38fdd713..724cad5def 100644
--- a/eos/effects/shipmodeshtoptimalrangepostdiv.py
+++ b/eos/effects/shipmodeshtoptimalrangepostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Hecate Sharpshooter Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
diff --git a/eos/effects/shipmodespttrackingpostdiv.py b/eos/effects/shipmodespttrackingpostdiv.py
index 40c5cdaebb..6e35633160 100644
--- a/eos/effects/shipmodespttrackingpostdiv.py
+++ b/eos/effects/shipmodespttrackingpostdiv.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: Svipul Sharpshooter Mode
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(
         lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
diff --git a/eos/effects/shipmtfalloffbonusatc.py b/eos/effects/shipmtfalloffbonusatc.py
index d340214538..199209b3aa 100644
--- a/eos/effects/shipmtfalloffbonusatc.py
+++ b/eos/effects/shipmtfalloffbonusatc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/shipmtfalloffbonusatf.py b/eos/effects/shipmtfalloffbonusatf.py
index 27493c0605..737efa5701 100644
--- a/eos/effects/shipmtfalloffbonusatf.py
+++ b/eos/effects/shipmtfalloffbonusatf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Freki
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATF2"))
\ No newline at end of file
+                                  "falloff", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipmtmaxrangebonusatc.py b/eos/effects/shipmtmaxrangebonusatc.py
index 2219baabe3..0cc9e309a3 100644
--- a/eos/effects/shipmtmaxrangebonusatc.py
+++ b/eos/effects/shipmtmaxrangebonusatc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/shipmtmaxrangebonusatf.py b/eos/effects/shipmtmaxrangebonusatf.py
index a773a9f8ba..e59725ea04 100644
--- a/eos/effects/shipmtmaxrangebonusatf.py
+++ b/eos/effects/shipmtmaxrangebonusatf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Freki
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/shipneutdestabilizationamountbonusrookie.py b/eos/effects/shipneutdestabilizationamountbonusrookie.py
index 1d1aa57adc..3a98a9e7cb 100644
--- a/eos/effects/shipneutdestabilizationamountbonusrookie.py
+++ b/eos/effects/shipneutdestabilizationamountbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hematos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyNeutralizerAmount", ship.getModifiedItemAttr("rookieNeutDrain"))
diff --git a/eos/effects/shipnostransferamountbonusrookie.py b/eos/effects/shipnostransferamountbonusrookie.py
index 8105398154..fbbe40fc00 100644
--- a/eos/effects/shipnostransferamountbonusrookie.py
+++ b/eos/effects/shipnostransferamountbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hematos
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("rookieNosDrain"))
diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/shippdmgbonusmf.py
index b9f2218714..4fa2ee88e2 100644
--- a/eos/effects/shippdmgbonusmf.py
+++ b/eos/effects/shippdmgbonusmf.py
@@ -7,6 +7,8 @@
 # Ship: Freki
 # Ship: Republic Fleet Firetail
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipprojectiledamagemd1.py b/eos/effects/shipprojectiledamagemd1.py
index 3aca825cda..171332da4c 100644
--- a/eos/effects/shipprojectiledamagemd1.py
+++ b/eos/effects/shipprojectiledamagemd1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of ship: Thrasher (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1"),
+                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/shipprojectiledmgmc.py b/eos/effects/shipprojectiledmgmc.py
index 843de102e0..4a236b998f 100644
--- a/eos/effects/shipprojectiledmgmc.py
+++ b/eos/effects/shipprojectiledmgmc.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipprojectiledmgmc2.py b/eos/effects/shipprojectiledmgmc2.py
index d12ee574bf..c313f8e7ec 100644
--- a/eos/effects/shipprojectiledmgmc2.py
+++ b/eos/effects/shipprojectiledmgmc2.py
@@ -5,6 +5,9 @@
 # Ship: Cynabal
 # Ship: Moracha
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2"),
+                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/shipprojectiledmgpiratecruiser.py b/eos/effects/shipprojectiledmgpiratecruiser.py
index d7f8502a2b..6753262b94 100644
--- a/eos/effects/shipprojectiledmgpiratecruiser.py
+++ b/eos/effects/shipprojectiledmgpiratecruiser.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipprojectilefalloffbonusmbc2.py b/eos/effects/shipprojectilefalloffbonusmbc2.py
index ba1715a21a..cd9fc15aea 100644
--- a/eos/effects/shipprojectilefalloffbonusmbc2.py
+++ b/eos/effects/shipprojectilefalloffbonusmbc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Tornado
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipprojectileoptimalbonusemf2.py b/eos/effects/shipprojectileoptimalbonusemf2.py
index fe1aa2fbfa..d4245be725 100644
--- a/eos/effects/shipprojectileoptimalbonusemf2.py
+++ b/eos/effects/shipprojectileoptimalbonusemf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Cheetah
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py
index 691116b52a..da832307f1 100644
--- a/eos/effects/shipprojectilerof1mbc2.py
+++ b/eos/effects/shipprojectilerof1mbc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Hurricane
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipprojectilerofbonusmbc1.py b/eos/effects/shipprojectilerofbonusmbc1.py
index bdac0bc586..6df3698aff 100644
--- a/eos/effects/shipprojectilerofbonusmbc1.py
+++ b/eos/effects/shipprojectilerofbonusmbc1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Tornado
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipprojectilerofpiratebattleship.py b/eos/effects/shipprojectilerofpiratebattleship.py
index 7cf436feb9..dac3c25440 100644
--- a/eos/effects/shipprojectilerofpiratebattleship.py
+++ b/eos/effects/shipprojectilerofpiratebattleship.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Machariel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipprojectilerofpiratecruiser.py b/eos/effects/shipprojectilerofpiratecruiser.py
index 85f5f2bab4..fae33e2065 100644
--- a/eos/effects/shipprojectilerofpiratecruiser.py
+++ b/eos/effects/shipprojectilerofpiratecruiser.py
@@ -4,6 +4,8 @@
 # Ship: Cynabal
 # Ship: Moracha
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipprojectiletracking1md2.py b/eos/effects/shipprojectiletracking1md2.py
index 8ccf42bd8e..a2b7e23716 100644
--- a/eos/effects/shipprojectiletracking1md2.py
+++ b/eos/effects/shipprojectiletracking1md2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Thrasher (2 of 2)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/shipprojectiletrackinggf.py b/eos/effects/shipprojectiletrackinggf.py
index 0085c314a3..f4f73849f3 100644
--- a/eos/effects/shipprojectiletrackinggf.py
+++ b/eos/effects/shipprojectiletrackinggf.py
@@ -4,6 +4,8 @@
 # Ship: Chremoas
 # Ship: Dramiel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipprojectiletrackingmf2.py b/eos/effects/shipprojectiletrackingmf2.py
index 03dc39d2e0..88b8f62263 100644
--- a/eos/effects/shipprojectiletrackingmf2.py
+++ b/eos/effects/shipprojectiletrackingmf2.py
@@ -6,6 +6,8 @@
 # Ship: Republic Fleet Firetail
 # Ship: Wolf
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py
index bfd3d4028e..f6809435e2 100644
--- a/eos/effects/shipptdmgbonusmb.py
+++ b/eos/effects/shipptdmgbonusmb.py
@@ -5,6 +5,9 @@
 # Ship: Machariel
 # Ship: Panther
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB"),
+                                  skill="Minmatar Battleship")
diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/shipptspeedbonusmb2.py
index c403ee4525..79d00479b8 100644
--- a/eos/effects/shipptspeedbonusmb2.py
+++ b/eos/effects/shipptspeedbonusmb2.py
@@ -6,6 +6,8 @@
 # Ship: Panther
 # Ship: Typhoon Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship")
diff --git a/eos/effects/shippturretfalloffbonusgb.py b/eos/effects/shippturretfalloffbonusgb.py
index 2ee55dd4d0..18a7dfc806 100644
--- a/eos/effects/shippturretfalloffbonusgb.py
+++ b/eos/effects/shippturretfalloffbonusgb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Machariel
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/shippturretfalloffbonusgc.py b/eos/effects/shippturretfalloffbonusgc.py
index 315df7bf34..ba5f3f80db 100644
--- a/eos/effects/shippturretfalloffbonusgc.py
+++ b/eos/effects/shippturretfalloffbonusgc.py
@@ -4,6 +4,8 @@
 # Ship: Cynabal
 # Ship: Moracha
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shippturretfalloffbonusmc2.py b/eos/effects/shippturretfalloffbonusmc2.py
index 390742d77a..b47f36f1d8 100644
--- a/eos/effects/shippturretfalloffbonusmc2.py
+++ b/eos/effects/shippturretfalloffbonusmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Stabber
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/shippturretspeedbonusmc.py
index 608073c626..713a2b7de1 100644
--- a/eos/effects/shippturretspeedbonusmc.py
+++ b/eos/effects/shippturretspeedbonusmc.py
@@ -6,6 +6,8 @@
 # Ship: Huginn
 # Ship: Scythe Fleet Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
                                   "speed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipremotearmorfalloffac2.py b/eos/effects/shipremotearmorfalloffac2.py
index 4194a0eee5..8b86803ea4 100644
--- a/eos/effects/shipremotearmorfalloffac2.py
+++ b/eos/effects/shipremotearmorfalloffac2.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"),
+                                  skill="Amarr Cruiser")
diff --git a/eos/effects/shipremotearmorfalloffgc1.py b/eos/effects/shipremotearmorfalloffgc1.py
index 03a5b8b3c2..956f3158e1 100644
--- a/eos/effects/shipremotearmorfalloffgc1.py
+++ b/eos/effects/shipremotearmorfalloffgc1.py
@@ -3,5 +3,9 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"),
+                                  skill="Gallente Cruiser")
diff --git a/eos/effects/shipremotearmorrange1.py b/eos/effects/shipremotearmorrange1.py
index 6db4e683e9..0523c9f954 100644
--- a/eos/effects/shipremotearmorrange1.py
+++ b/eos/effects/shipremotearmorrange1.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipremotearmorrange2.py b/eos/effects/shipremotearmorrange2.py
index 457cd51346..f544710697 100644
--- a/eos/effects/shipremotearmorrange2.py
+++ b/eos/effects/shipremotearmorrange2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipremotearmorrangeac2.py b/eos/effects/shipremotearmorrangeac2.py
index d06c6912ef..05e10ee652 100644
--- a/eos/effects/shipremotearmorrangeac2.py
+++ b/eos/effects/shipremotearmorrangeac2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Guardian
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
+                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipremotearmorrangegc1.py b/eos/effects/shipremotearmorrangegc1.py
index 718c4503b9..737631924c 100644
--- a/eos/effects/shipremotearmorrangegc1.py
+++ b/eos/effects/shipremotearmorrangegc1.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
+                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipremotesensordampenercapneedgf.py b/eos/effects/shipremotesensordampenercapneedgf.py
index 65a8e05242..ac0d806507 100644
--- a/eos/effects/shipremotesensordampenercapneedgf.py
+++ b/eos/effects/shipremotesensordampenercapneedgf.py
@@ -4,6 +4,8 @@
 # Ship: Keres
 # Ship: Maulus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shiprocketemdmgaf.py b/eos/effects/shiprocketemdmgaf.py
index 4e2cf3ff7d..440ae90cb6 100644
--- a/eos/effects/shiprocketemdmgaf.py
+++ b/eos/effects/shiprocketemdmgaf.py
@@ -4,6 +4,8 @@
 # Ship: Anathema
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "emDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiprocketemthermkindmgmf2.py b/eos/effects/shiprocketemthermkindmgmf2.py
index f5a3e3f79a..0508f7f78e 100644
--- a/eos/effects/shiprocketemthermkindmgmf2.py
+++ b/eos/effects/shiprocketemthermkindmgmf2.py
@@ -3,7 +3,12 @@
 # Used by:
 # Ship: Vigil Fleet Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "thermalDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "kineticDamage", src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage",
+                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "thermalDamage",
+                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "kineticDamage",
+                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shiprocketexpdmgmf3.py b/eos/effects/shiprocketexpdmgmf3.py
index 2ba97c41d4..0220365602 100644
--- a/eos/effects/shiprocketexpdmgmf3.py
+++ b/eos/effects/shiprocketexpdmgmf3.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Vigil Fleet Issue
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage", src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage",
+                                    src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shiprocketexplosivedmgaf.py b/eos/effects/shiprocketexplosivedmgaf.py
index 94c1b5bae7..4ff2ef7f25 100644
--- a/eos/effects/shiprocketexplosivedmgaf.py
+++ b/eos/effects/shiprocketexplosivedmgaf.py
@@ -4,6 +4,8 @@
 # Ship: Anathema
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "explosiveDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiprocketexplosivedmgmd1.py b/eos/effects/shiprocketexplosivedmgmd1.py
index d2ee8f4190..73c57b8aa5 100644
--- a/eos/effects/shiprocketexplosivedmgmd1.py
+++ b/eos/effects/shiprocketexplosivedmgmd1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Talwar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
+                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/shiprocketkineticdmgaf.py b/eos/effects/shiprocketkineticdmgaf.py
index 5198af656f..f3b1785359 100644
--- a/eos/effects/shiprocketkineticdmgaf.py
+++ b/eos/effects/shiprocketkineticdmgaf.py
@@ -4,6 +4,8 @@
 # Ship: Anathema
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "kineticDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiprocketkineticdmgcd1.py b/eos/effects/shiprocketkineticdmgcd1.py
index 9e34cee8fa..79de18da3e 100644
--- a/eos/effects/shiprocketkineticdmgcd1.py
+++ b/eos/effects/shiprocketkineticdmgcd1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Corax
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
+                                    skill="Caldari Destroyer")
diff --git a/eos/effects/shiprocketmaxvelocitybonusrookie.py b/eos/effects/shiprocketmaxvelocitybonusrookie.py
index 0ea86b89aa..998eb54e80 100644
--- a/eos/effects/shiprocketmaxvelocitybonusrookie.py
+++ b/eos/effects/shiprocketmaxvelocitybonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "maxVelocity", ship.getModifiedItemAttr("rookieRocketVelocity"))
diff --git a/eos/effects/shiprocketrofbonusaf2.py b/eos/effects/shiprocketrofbonusaf2.py
index 3f4ebc575c..d272d6ec7c 100644
--- a/eos/effects/shiprocketrofbonusaf2.py
+++ b/eos/effects/shiprocketrofbonusaf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Malediction
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
                                   "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shiprocketthermaldmgaf.py b/eos/effects/shiprocketthermaldmgaf.py
index a524f2a434..b937c67603 100644
--- a/eos/effects/shiprocketthermaldmgaf.py
+++ b/eos/effects/shiprocketthermaldmgaf.py
@@ -4,6 +4,8 @@
 # Ship: Anathema
 # Ship: Vengeance
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
                                     "thermalDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
index 83f41c0034..8672aad794 100644
--- a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
+++ b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py
@@ -5,6 +5,8 @@
 # Ship: Astero
 # Ship: Gnosis
 type = "passive"
+
+
 def handler(fit, container, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
                                     "baseSensorStrength", container.getModifiedItemAttr("shipBonusPirateFaction2"))
diff --git a/eos/effects/shipscanprobestrengthbonuspiratefaction.py b/eos/effects/shipscanprobestrengthbonuspiratefaction.py
index a70cee109b..c5146f2523 100644
--- a/eos/effects/shipscanprobestrengthbonuspiratefaction.py
+++ b/eos/effects/shipscanprobestrengthbonuspiratefaction.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nestor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
                                     "baseSensorStrength", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipscanresolutionbonusonline.py b/eos/effects/shipscanresolutionbonusonline.py
index 280cd188e9..1de7306583 100644
--- a/eos/effects/shipscanresolutionbonusonline.py
+++ b/eos/effects/shipscanresolutionbonusonline.py
@@ -4,6 +4,8 @@
 # Modules from group: Signal Amplifier (7 of 7)
 # Module: QA Damage Module
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True)
+                           stackingPenalties=True)
diff --git a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
index 1efdfc0d0a..3cf50a4394 100644
--- a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
+++ b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Confessor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2"), skill="Amarr Tactical Destroyer")
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2"),
+                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
index 61ce24b4fb..ce45c042aa 100644
--- a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
+++ b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Confessor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1"), skill="Amarr Tactical Destroyer")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1"),
+                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/shipsetdmgbonusaf.py b/eos/effects/shipsetdmgbonusaf.py
index 920aae96c1..5ecc4f4a22 100644
--- a/eos/effects/shipsetdmgbonusaf.py
+++ b/eos/effects/shipsetdmgbonusaf.py
@@ -6,6 +6,8 @@
 # Ship: Silver Magnate
 # Ship: Tormentor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipsetdmgbonusrookie.py b/eos/effects/shipsetdmgbonusrookie.py
index 658262897a..d32fd04e78 100644
--- a/eos/effects/shipsetdmgbonusrookie.py
+++ b/eos/effects/shipsetdmgbonusrookie.py
@@ -5,6 +5,8 @@
 # Ship: Immolator
 # Ship: Impairor
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("rookieSETDamageBonus"))
diff --git a/eos/effects/shipsetoptimalbonusrookie.py b/eos/effects/shipsetoptimalbonusrookie.py
index d64510404b..771ffbc652 100644
--- a/eos/effects/shipsetoptimalbonusrookie.py
+++ b/eos/effects/shipsetoptimalbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Immolator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("rookieSETOptimal"))
diff --git a/eos/effects/shipsettrackingbonusaf.py b/eos/effects/shipsettrackingbonusaf.py
index 3d5f3e6715..f14d24419f 100644
--- a/eos/effects/shipsettrackingbonusaf.py
+++ b/eos/effects/shipsettrackingbonusaf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Retribution
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipsettrackingbonusrookie.py b/eos/effects/shipsettrackingbonusrookie.py
index dc3c4a8756..c901d1374b 100644
--- a/eos/effects/shipsettrackingbonusrookie.py
+++ b/eos/effects/shipsettrackingbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Immolator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("rookieSETTracking"))
diff --git a/eos/effects/shipshieldboost1mbc1.py b/eos/effects/shipshieldboost1mbc1.py
index 22f5ccf360..5f9abe4650 100644
--- a/eos/effects/shipshieldboost1mbc1.py
+++ b/eos/effects/shipshieldboost1mbc1.py
@@ -4,6 +4,9 @@
 # Variations of ship: Cyclone (2 of 2)
 # Ship: Sleipnir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser")
+                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1"),
+                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipshieldboostmf.py b/eos/effects/shipshieldboostmf.py
index 3eac982bb2..1931f684d9 100644
--- a/eos/effects/shipshieldboostmf.py
+++ b/eos/effects/shipshieldboostmf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Breacher
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipshieldboostrookie.py b/eos/effects/shipshieldboostrookie.py
index 5a68e719ad..55cf58a789 100644
--- a/eos/effects/shipshieldboostrookie.py
+++ b/eos/effects/shipshieldboostrookie.py
@@ -4,6 +4,8 @@
 # Ship: Immolator
 # Ship: Reaper
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
                                   "shieldBonus", ship.getModifiedItemAttr("rookieShieldBoostBonus"))
diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py
index 596be5ef55..83a19ed65f 100644
--- a/eos/effects/shipshieldemresistance1cbc2.py
+++ b/eos/effects/shipshieldemresistance1cbc2.py
@@ -4,5 +4,8 @@
 # Variations of ship: Drake (3 of 3)
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
+                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldemresistancecc2.py b/eos/effects/shipshieldemresistancecc2.py
index 13fc8fef35..20a8e86a3e 100644
--- a/eos/effects/shipshieldemresistancecc2.py
+++ b/eos/effects/shipshieldemresistancecc2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Variations of ship: Moa (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/shipshieldemresistancecf2.py
index 9fd39ede57..4e68a86aa9 100644
--- a/eos/effects/shipshieldemresistancecf2.py
+++ b/eos/effects/shipshieldemresistancecf2.py
@@ -5,5 +5,7 @@
 # Ship: Cambion
 # Ship: Whiptail
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipshieldemresistancerookie.py b/eos/effects/shipshieldemresistancerookie.py
index c767db3fda..7005269f05 100644
--- a/eos/effects/shipshieldemresistancerookie.py
+++ b/eos/effects/shipshieldemresistancerookie.py
@@ -5,5 +5,7 @@
 # Ship: Ibis
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py
index b682971f36..5f5559e195 100644
--- a/eos/effects/shipshieldexplosiveresistance1cbc2.py
+++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py
@@ -4,5 +4,8 @@
 # Variations of ship: Drake (3 of 3)
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
+                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldexplosiveresistancecc2.py b/eos/effects/shipshieldexplosiveresistancecc2.py
index e40a362697..203b2676a9 100644
--- a/eos/effects/shipshieldexplosiveresistancecc2.py
+++ b/eos/effects/shipshieldexplosiveresistancecc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Moa (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
+                           skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldexplosiveresistancecf2.py b/eos/effects/shipshieldexplosiveresistancecf2.py
index d71caf7c97..264c2b94d8 100644
--- a/eos/effects/shipshieldexplosiveresistancecf2.py
+++ b/eos/effects/shipshieldexplosiveresistancecf2.py
@@ -5,5 +5,8 @@
 # Ship: Cambion
 # Ship: Whiptail
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
+                           skill="Caldari Frigate")
diff --git a/eos/effects/shipshieldexplosiveresistancerookie.py b/eos/effects/shipshieldexplosiveresistancerookie.py
index 7ef2c57134..fc80e979d8 100644
--- a/eos/effects/shipshieldexplosiveresistancerookie.py
+++ b/eos/effects/shipshieldexplosiveresistancerookie.py
@@ -5,5 +5,7 @@
 # Ship: Ibis
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py
index e6e90197e8..4fccf027ef 100644
--- a/eos/effects/shipshieldkineticresistance1cbc2.py
+++ b/eos/effects/shipshieldkineticresistance1cbc2.py
@@ -4,5 +4,8 @@
 # Variations of ship: Drake (3 of 3)
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
+                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldkineticresistancecc2.py b/eos/effects/shipshieldkineticresistancecc2.py
index ee429305fb..d8477420c6 100644
--- a/eos/effects/shipshieldkineticresistancecc2.py
+++ b/eos/effects/shipshieldkineticresistancecc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Moa (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
+                           skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldkineticresistancecf2.py b/eos/effects/shipshieldkineticresistancecf2.py
index efbdbb1848..3fd3ebb899 100644
--- a/eos/effects/shipshieldkineticresistancecf2.py
+++ b/eos/effects/shipshieldkineticresistancecf2.py
@@ -5,5 +5,8 @@
 # Ship: Cambion
 # Ship: Whiptail
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
+                           skill="Caldari Frigate")
diff --git a/eos/effects/shipshieldkineticresistancerookie.py b/eos/effects/shipshieldkineticresistancerookie.py
index 5ede0d774c..1d9a00d393 100644
--- a/eos/effects/shipshieldkineticresistancerookie.py
+++ b/eos/effects/shipshieldkineticresistancerookie.py
@@ -5,5 +5,7 @@
 # Ship: Ibis
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py
index db0da414a3..fad8935c75 100644
--- a/eos/effects/shipshieldthermalresistance1cbc2.py
+++ b/eos/effects/shipshieldthermalresistance1cbc2.py
@@ -4,5 +4,8 @@
 # Variations of ship: Drake (3 of 3)
 # Ship: Vulture
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
+                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldthermalresistancecc2.py b/eos/effects/shipshieldthermalresistancecc2.py
index c84d5007ac..9c9328d430 100644
--- a/eos/effects/shipshieldthermalresistancecc2.py
+++ b/eos/effects/shipshieldthermalresistancecc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Variations of ship: Moa (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
+                           skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldthermalresistancecf2.py b/eos/effects/shipshieldthermalresistancecf2.py
index df75d3e002..739d4033f1 100644
--- a/eos/effects/shipshieldthermalresistancecf2.py
+++ b/eos/effects/shipshieldthermalresistancecf2.py
@@ -5,5 +5,8 @@
 # Ship: Cambion
 # Ship: Whiptail
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
+                           skill="Caldari Frigate")
diff --git a/eos/effects/shipshieldthermalresistancerookie.py b/eos/effects/shipshieldthermalresistancerookie.py
index 4190a1a321..6b270aa7d1 100644
--- a/eos/effects/shipshieldthermalresistancerookie.py
+++ b/eos/effects/shipshieldthermalresistancerookie.py
@@ -5,5 +5,7 @@
 # Ship: Ibis
 # Ship: Taipan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/shipshieldtransferfalloffcc1.py b/eos/effects/shipshieldtransferfalloffcc1.py
index 515f25bd25..64acc70994 100644
--- a/eos/effects/shipshieldtransferfalloffcc1.py
+++ b/eos/effects/shipshieldtransferfalloffcc1.py
@@ -4,5 +4,8 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldtransferfalloffmc2.py b/eos/effects/shipshieldtransferfalloffmc2.py
index 5f5afb211d..23a27ca852 100644
--- a/eos/effects/shipshieldtransferfalloffmc2.py
+++ b/eos/effects/shipshieldtransferfalloffmc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
+                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipshieldtransferrange1.py b/eos/effects/shipshieldtransferrange1.py
index aee106097b..15d4c644d1 100644
--- a/eos/effects/shipshieldtransferrange1.py
+++ b/eos/effects/shipshieldtransferrange1.py
@@ -4,6 +4,9 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "shieldTransferRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("shipBonusCC"),
+                                  skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldtransferrange2.py b/eos/effects/shipshieldtransferrange2.py
index 9246c9005c..f86fee17fd 100644
--- a/eos/effects/shipshieldtransferrange2.py
+++ b/eos/effects/shipshieldtransferrange2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "shieldTransferRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("shipBonusMC2"),
+                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/shipshieldtransferrangecc1.py b/eos/effects/shipshieldtransferrangecc1.py
index e3db5f4d72..fc9ef4cfd8 100644
--- a/eos/effects/shipshieldtransferrangecc1.py
+++ b/eos/effects/shipshieldtransferrangecc1.py
@@ -4,5 +4,8 @@
 # Ship: Basilisk
 # Ship: Etana
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
+                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipshieldtransferrangemc2.py b/eos/effects/shipshieldtransferrangemc2.py
index 95af8e1577..f7096dea40 100644
--- a/eos/effects/shipshieldtransferrangemc2.py
+++ b/eos/effects/shipshieldtransferrangemc2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange", src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
+                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py
index d5bd3f2665..3162880ba3 100644
--- a/eos/effects/shipshtdmgbonusgf.py
+++ b/eos/effects/shipshtdmgbonusgf.py
@@ -7,6 +7,8 @@
 # Ship: Helios
 # Ship: Taranis
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipshtdmgbonusrookie.py b/eos/effects/shipshtdmgbonusrookie.py
index 22af93125d..27939cc52b 100644
--- a/eos/effects/shipshtdmgbonusrookie.py
+++ b/eos/effects/shipshtdmgbonusrookie.py
@@ -4,6 +4,8 @@
 # Ship: Velator
 # Ship: Violator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("rookieSHTDamageBonus"))
diff --git a/eos/effects/shipshtfalloffbonusrookie.py b/eos/effects/shipshtfalloffbonusrookie.py
index 8f4bf42125..b4083f4d3b 100644
--- a/eos/effects/shipshtfalloffbonusrookie.py
+++ b/eos/effects/shipshtfalloffbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Violator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "falloff", ship.getModifiedItemAttr("rookieSHTFalloff"))
diff --git a/eos/effects/shipshtoptimalbonusgf.py b/eos/effects/shipshtoptimalbonusgf.py
index 0a64f25d87..e6682472b5 100644
--- a/eos/effects/shipshtoptimalbonusgf.py
+++ b/eos/effects/shipshtoptimalbonusgf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ares
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/shipshtrofgallentetacticaldestroyer1.py b/eos/effects/shipshtrofgallentetacticaldestroyer1.py
index 989706ef06..64e164ab94 100644
--- a/eos/effects/shipshtrofgallentetacticaldestroyer1.py
+++ b/eos/effects/shipshtrofgallentetacticaldestroyer1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hecate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1"), skill="Gallente Tactical Destroyer")
+                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1"),
+                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/shipshttrackinggallentetacticaldestroyer2.py b/eos/effects/shipshttrackinggallentetacticaldestroyer2.py
index b78f3e29f7..dfcd8d7f29 100644
--- a/eos/effects/shipshttrackinggallentetacticaldestroyer2.py
+++ b/eos/effects/shipshttrackinggallentetacticaldestroyer2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Hecate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2"), skill="Gallente Tactical Destroyer")
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2"),
+                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/shipshttrackingspeedbonusrookie.py b/eos/effects/shipshttrackingspeedbonusrookie.py
index 0bb4dfe63a..48b2da45f9 100644
--- a/eos/effects/shipshttrackingspeedbonusrookie.py
+++ b/eos/effects/shipshttrackingspeedbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Violator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("rookieSHTTracking"))
diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/shipsiegelauncherrofbonus2cb.py
index a3a4a2123c..9ab173443f 100644
--- a/eos/effects/shipsiegelauncherrofbonus2cb.py
+++ b/eos/effects/shipsiegelauncherrofbonus2cb.py
@@ -4,6 +4,8 @@
 # Ship: Raven
 # Ship: Raven State Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
                                   "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/shipsmallmissiledmgpiratefaction.py b/eos/effects/shipsmallmissiledmgpiratefaction.py
index ecafce21eb..9496ef0bbe 100644
--- a/eos/effects/shipsmallmissiledmgpiratefaction.py
+++ b/eos/effects/shipsmallmissiledmgpiratefaction.py
@@ -3,7 +3,10 @@
 # Used by:
 # Ship: Jackdaw
 type = "passive"
+
+
 def handler(fit, ship, context):
     for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusPirateFaction"))
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+            "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shipsmallmissileemdmgcf2.py b/eos/effects/shipsmallmissileemdmgcf2.py
index 0e8db486af..3a08f5b10e 100644
--- a/eos/effects/shipsmallmissileemdmgcf2.py
+++ b/eos/effects/shipsmallmissileemdmgcf2.py
@@ -4,6 +4,9 @@
 # Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipsmallmissileexpdmgcf2.py b/eos/effects/shipsmallmissileexpdmgcf2.py
index 4a79cab545..2c03823e61 100644
--- a/eos/effects/shipsmallmissileexpdmgcf2.py
+++ b/eos/effects/shipsmallmissileexpdmgcf2.py
@@ -4,6 +4,9 @@
 # Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipsmallmissilekindmgcf2.py b/eos/effects/shipsmallmissilekindmgcf2.py
index 946429934a..9adc59089c 100644
--- a/eos/effects/shipsmallmissilekindmgcf2.py
+++ b/eos/effects/shipsmallmissilekindmgcf2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Kestrel
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipsmallmissilekindmgcf3.py b/eos/effects/shipsmallmissilekindmgcf3.py
index 3e8ea0e3a4..bdef8ba126 100644
--- a/eos/effects/shipsmallmissilekindmgcf3.py
+++ b/eos/effects/shipsmallmissilekindmgcf3.py
@@ -4,5 +4,9 @@
 # Ship: Caldari Navy Hookbill
 
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), "kineticDamage", src.getModifiedItemAttr("shipBonus3CF"), skill="Caldari Frigate")
\ No newline at end of file
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), "kineticDamage",
+        src.getModifiedItemAttr("shipBonus3CF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipsmallmissilethermdmgcf2.py b/eos/effects/shipsmallmissilethermdmgcf2.py
index 02d5e185e7..e336853e62 100644
--- a/eos/effects/shipsmallmissilethermdmgcf2.py
+++ b/eos/effects/shipsmallmissilethermdmgcf2.py
@@ -4,6 +4,9 @@
 # Ship: Caldari Navy Hookbill
 # Ship: Kestrel
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(
+        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
+        "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py
index 6d6f26a278..9c435c7de5 100644
--- a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py
+++ b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Svipul
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1"), skill="Minmatar Tactical Destroyer")
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1"),
+                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/shipsptdmgbonusrookie.py b/eos/effects/shipsptdmgbonusrookie.py
index c3bfd0ae70..3646da72c3 100644
--- a/eos/effects/shipsptdmgbonusrookie.py
+++ b/eos/effects/shipsptdmgbonusrookie.py
@@ -4,6 +4,8 @@
 # Ship: Echo
 # Ship: Reaper
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("rookieSPTDamageBonus"))
diff --git a/eos/effects/shipsptfalloffbonusrookie.py b/eos/effects/shipsptfalloffbonusrookie.py
index e5f2a5c4ac..0509c7ddeb 100644
--- a/eos/effects/shipsptfalloffbonusrookie.py
+++ b/eos/effects/shipsptfalloffbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Echo
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "falloff", ship.getModifiedItemAttr("rookieSPTFalloff"))
diff --git a/eos/effects/shipsptoptimalbonusmf.py b/eos/effects/shipsptoptimalbonusmf.py
index 66d544a58b..1f7255f441 100644
--- a/eos/effects/shipsptoptimalbonusmf.py
+++ b/eos/effects/shipsptoptimalbonusmf.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Chremoas
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
index 9eae30565e..0668d5b002 100644
--- a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
+++ b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Svipul
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2"), skill="Minmatar Tactical Destroyer")
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2"),
+                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/shipsptoptimalrangebonusrookie.py b/eos/effects/shipsptoptimalrangebonusrookie.py
index 49cb01456d..a7c289feab 100644
--- a/eos/effects/shipsptoptimalrangebonusrookie.py
+++ b/eos/effects/shipsptoptimalrangebonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Echo
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("rookieSPTOptimal"))
diff --git a/eos/effects/shipspttrackingspeedbonusrookie.py b/eos/effects/shipspttrackingspeedbonusrookie.py
index 22595b8713..c6a0bca151 100644
--- a/eos/effects/shipspttrackingspeedbonusrookie.py
+++ b/eos/effects/shipspttrackingspeedbonusrookie.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Echo
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("rookieSPTTracking"))
diff --git a/eos/effects/shipstasiswebrangebonusmb.py b/eos/effects/shipstasiswebrangebonusmb.py
index d1f250b1a2..b7513bbdaf 100644
--- a/eos/effects/shipstasiswebrangebonusmb.py
+++ b/eos/effects/shipstasiswebrangebonusmb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Bhaalgorn
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/shipstasiswebrangebonusmc2.py b/eos/effects/shipstasiswebrangebonusmc2.py
index 059a9dc7cd..3b43a9b64b 100644
--- a/eos/effects/shipstasiswebrangebonusmc2.py
+++ b/eos/effects/shipstasiswebrangebonusmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Ashimmu
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipstasiswebstrengthbonusmc2.py b/eos/effects/shipstasiswebstrengthbonusmc2.py
index a521658534..65e9bb3b86 100644
--- a/eos/effects/shipstasiswebstrengthbonusmc2.py
+++ b/eos/effects/shipstasiswebstrengthbonusmc2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Vigilant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "speedFactor", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shipstasiswebstrengthbonusmf2.py b/eos/effects/shipstasiswebstrengthbonusmf2.py
index fc1185cf1d..d2f5b1ad4c 100644
--- a/eos/effects/shipstasiswebstrengthbonusmf2.py
+++ b/eos/effects/shipstasiswebstrengthbonusmf2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Daredevil
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "speedFactor", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/shiptcapneedbonusac.py b/eos/effects/shiptcapneedbonusac.py
index 8bece86f40..00e4ac757d 100644
--- a/eos/effects/shiptcapneedbonusac.py
+++ b/eos/effects/shiptcapneedbonusac.py
@@ -5,6 +5,8 @@
 # Ship: Omen
 # Ship: Zealot
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
                                   "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shiptorpedoaoecloudsize1cb.py b/eos/effects/shiptorpedoaoecloudsize1cb.py
index b079f5663a..ca8a1b166c 100644
--- a/eos/effects/shiptorpedoaoecloudsize1cb.py
+++ b/eos/effects/shiptorpedoaoecloudsize1cb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Raven Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shiptorpedorofcb.py b/eos/effects/shiptorpedorofcb.py
index 86d0e30e3c..22d81e5fa7 100644
--- a/eos/effects/shiptorpedorofcb.py
+++ b/eos/effects/shiptorpedorofcb.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scorpion Navy Issue
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
                                   "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py
index 6c4f582a54..6bedfb8c6b 100644
--- a/eos/effects/shiptorpedosvelocitybonuscb3.py
+++ b/eos/effects/shiptorpedosvelocitybonuscb3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Variations of ship: Raven (3 of 4)
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
                                     "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/shiptrackingbonusab.py b/eos/effects/shiptrackingbonusab.py
index 25368aff40..ad820e01db 100644
--- a/eos/effects/shiptrackingbonusab.py
+++ b/eos/effects/shiptrackingbonusab.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Nightmare
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
                                   "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shiptrackinglinkrange1fixed.py b/eos/effects/shiptrackinglinkrange1fixed.py
index be139ea71f..233590460e 100644
--- a/eos/effects/shiptrackinglinkrange1fixed.py
+++ b/eos/effects/shiptrackinglinkrange1fixed.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Scimitar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/shiptrackinglinkrange2group.py b/eos/effects/shiptrackinglinkrange2group.py
index 537d0d46e7..42ef76a238 100644
--- a/eos/effects/shiptrackinglinkrange2group.py
+++ b/eos/effects/shiptrackinglinkrange2group.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Oneiros
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
                                   "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/shipvelocitybonusai.py b/eos/effects/shipvelocitybonusai.py
index b9f5257d93..3ba16182dd 100644
--- a/eos/effects/shipvelocitybonusai.py
+++ b/eos/effects/shipvelocitybonusai.py
@@ -4,5 +4,7 @@
 # Variations of ship: Bestower (2 of 2)
 # Ship: Prorator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/shipvelocitybonusatc1.py b/eos/effects/shipvelocitybonusatc1.py
index 6f4a4cc41e..7b2c318305 100644
--- a/eos/effects/shipvelocitybonusatc1.py
+++ b/eos/effects/shipvelocitybonusatc1.py
@@ -4,5 +4,7 @@
 # Ship: Adrestia
 # Ship: Mimir
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/shipvelocitybonusmi.py
index a29a8295d8..fe05cb921e 100644
--- a/eos/effects/shipvelocitybonusmi.py
+++ b/eos/effects/shipvelocitybonusmi.py
@@ -5,5 +5,7 @@
 # Ship: Hoarder
 # Ship: Prowler
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/shipvelocitybonusrookie.py b/eos/effects/shipvelocitybonusrookie.py
index 34b77de685..b0634e3f32 100644
--- a/eos/effects/shipvelocitybonusrookie.py
+++ b/eos/effects/shipvelocitybonusrookie.py
@@ -3,5 +3,7 @@
 # Used by:
 # Ship: Reaper
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("rookieShipVelocityBonus"))
diff --git a/eos/effects/shipwebvelocitybonusrookie.py b/eos/effects/shipwebvelocitybonusrookie.py
index 4b6aabb132..d8f5468c84 100644
--- a/eos/effects/shipwebvelocitybonusrookie.py
+++ b/eos/effects/shipwebvelocitybonusrookie.py
@@ -4,6 +4,8 @@
 # Ship: Hematos
 # Ship: Violator
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
                                   "speedFactor", ship.getModifiedItemAttr("rookieWebAmount"))
diff --git a/eos/effects/shipxlprojectiledamagerole.py b/eos/effects/shipxlprojectiledamagerole.py
index e79fcfda70..62f670f18d 100644
--- a/eos/effects/shipxlprojectiledamagerole.py
+++ b/eos/effects/shipxlprojectiledamagerole.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
diff --git a/eos/effects/shirmishwarfaremindlink.py b/eos/effects/shirmishwarfaremindlink.py
index 52cda4c11a..d0b60a62e8 100644
--- a/eos/effects/shirmishwarfaremindlink.py
+++ b/eos/effects/shirmishwarfaremindlink.py
@@ -5,6 +5,8 @@
 # Implant: Republic Fleet Warfare Mindlink
 # Implant: Skirmish Warfare Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.character.getSkill("Skirmish Warfare Specialist").suppress()
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
diff --git a/eos/effects/siegemodeeffect6.py b/eos/effects/siegemodeeffect6.py
index 8b27e7809f..25fc5afb4b 100644
--- a/eos/effects/siegemodeeffect6.py
+++ b/eos/effects/siegemodeeffect6.py
@@ -4,29 +4,31 @@
 # Variations of module: Siege Module I (2 of 2)
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
-    #Turrets
+    # Turrets
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \
-                                  mod.item.requiresSkill("Capital Hybrid Turret") or \
-                                  mod.item.requiresSkill("Capital Projectile Turret"),
+                                              mod.item.requiresSkill("Capital Hybrid Turret") or \
+                                              mod.item.requiresSkill("Capital Projectile Turret"),
                                   "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"))
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \
-                                  mod.item.requiresSkill("Capital Hybrid Turret") or \
-                                  mod.item.requiresSkill("Capital Projectile Turret"),
+                                              mod.item.requiresSkill("Capital Hybrid Turret") or \
+                                              mod.item.requiresSkill("Capital Projectile Turret"),
                                   "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"))
 
-    #Missiles
+    # Missiles
     for type in ("kinetic", "thermal", "explosive", "em"):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \
-                                        mod.charge.requiresSkill("XL Cruise Missiles"),
+                                                    mod.charge.requiresSkill("XL Cruise Missiles"),
                                         "%sDamage" % type, module.getModifiedItemAttr("damageMultiplierBonus"))
 
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \
-                                    mod.charge.requiresSkill("XL Cruise Missiles"),
+                                                mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "aoeVelocity", module.getModifiedItemAttr("aoeVelocityBonus"))
 
-    #Shield Boosters
+    # Shield Boosters
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
                                   "duration", module.getModifiedItemAttr("shieldBonusDurationBonus"),
                                   stackingPenalties=True)
@@ -34,7 +36,7 @@ def handler(fit, module, context):
                                   "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
                                   stackingPenalties=True)
 
-    #Armor Reppers
+    # Armor Reppers
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
                                   "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountBonus"),
                                   stackingPenalties=True)
@@ -42,19 +44,19 @@ def handler(fit, module, context):
                                   "duration", module.getModifiedItemAttr("armorDamageDurationBonus"),
                                   stackingPenalties=True)
 
-    #Speed penalty
+    # Speed penalty
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
 
-    #Mass
+    # Mass
     fit.ship.multiplyItemAttr("mass", module.getModifiedItemAttr("siegeMassMultiplier"))
 
-    #Scan resolution
+    # Scan resolution
     fit.ship.multiplyItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionMultiplier"),
                               stackingPenalties=True)
 
-    #Max locked targets
+    # Max locked targets
     fit.ship.forceItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargets"))
 
-    #Block Hostile EWAR and friendly effects
+    # Block Hostile EWAR and friendly effects
     fit.ship.forceItemAttr("disallowOffensiveModifiers", module.getModifiedItemAttr("disallowOffensiveModifiers"))
     fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))
diff --git a/eos/effects/siegesquadroncommand.py b/eos/effects/siegesquadroncommand.py
index fb4cc528a1..d48e18cf5f 100644
--- a/eos/effects/siegesquadroncommand.py
+++ b/eos/effects/siegesquadroncommand.py
@@ -4,6 +4,8 @@
 # Skill: Siege Warfare Specialist
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/siegewarfaremindlink.py b/eos/effects/siegewarfaremindlink.py
index 6160a25075..a071291c1d 100644
--- a/eos/effects/siegewarfaremindlink.py
+++ b/eos/effects/siegewarfaremindlink.py
@@ -5,6 +5,8 @@
 # Implant: Republic Fleet Warfare Mindlink
 # Implant: Siege Warfare Mindlink
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.character.getSkill("Siege Warfare Specialist").suppress()
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
diff --git a/eos/effects/siegewarfareshieldcapacitybonusreplacer.py b/eos/effects/siegewarfareshieldcapacitybonusreplacer.py
index 338de9c810..e2c1223e1c 100644
--- a/eos/effects/siegewarfareshieldcapacitybonusreplacer.py
+++ b/eos/effects/siegewarfareshieldcapacitybonusreplacer.py
@@ -7,5 +7,7 @@
 type = "gang"
 gangBoost = "shieldCapacity"
 gangBonus = "shieldCapacityBonus"
+
+
 def handler(fit, container, context):
     fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py b/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py
index 375cd3ac10..5401527b9e 100644
--- a/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py
+++ b/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py
@@ -6,6 +6,8 @@
 # Implant: Quafe Zero
 # Skill: Signature Analysis
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     penalized = False if "skill" in context or "implant" in context or "booster" in context else True
diff --git a/eos/effects/signatureradiuspreassignment.py b/eos/effects/signatureradiuspreassignment.py
index 3280bf78cd..e3f48fb5ad 100644
--- a/eos/effects/signatureradiuspreassignment.py
+++ b/eos/effects/signatureradiuspreassignment.py
@@ -4,5 +4,7 @@
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"
 runTime = "early"
+
+
 def handler(fit, module, context):
     fit.ship.preAssignItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadius"))
diff --git a/eos/effects/skilladvancedweaponupgradespowerneedbonus.py b/eos/effects/skilladvancedweaponupgradespowerneedbonus.py
index 2764a0fd41..6cd2337c92 100644
--- a/eos/effects/skilladvancedweaponupgradespowerneedbonus.py
+++ b/eos/effects/skilladvancedweaponupgradespowerneedbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Advanced Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery") or mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
+    fit.modules.filteredItemBoost(
+        lambda mod: mod.item.requiresSkill("Gunnery") or mod.item.requiresSkill("Missile Launcher Operation"),
+        "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py b/eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py
index b442eac9c6..769b0327f6 100644
--- a/eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py
+++ b/eos/effects/skilladvancedweaponupgradespowerneedbonusbomblaunchers.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Advanced Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
                                   "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py b/eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py
index e45268bb78..e56b2fb941 100644
--- a/eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py
+++ b/eos/effects/skillbombdeploymentmodulereactivationdelaybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Bomb Deployment
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Bomb",
                                   "moduleReactivationDelay", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/skillbonuscapitalartilleryspecialization.py b/eos/effects/skillbonuscapitalartilleryspecialization.py
index 521c6e8d2b..3a2f7b5c98 100644
--- a/eos/effects/skillbonuscapitalartilleryspecialization.py
+++ b/eos/effects/skillbonuscapitalartilleryspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Artillery Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Artillery Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Artillery Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuscapitalautocannonspecialization.py b/eos/effects/skillbonuscapitalautocannonspecialization.py
index d4fda1400b..9077ff3791 100644
--- a/eos/effects/skillbonuscapitalautocannonspecialization.py
+++ b/eos/effects/skillbonuscapitalautocannonspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Autocannon Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Autocannon Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Autocannon Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuscapitalbeamlaserspecialization.py b/eos/effects/skillbonuscapitalbeamlaserspecialization.py
index 6fcecf510f..82ff0a0c18 100644
--- a/eos/effects/skillbonuscapitalbeamlaserspecialization.py
+++ b/eos/effects/skillbonuscapitalbeamlaserspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Beam Laser Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Beam Laser Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Beam Laser Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuscapitalblasterspecialization.py b/eos/effects/skillbonuscapitalblasterspecialization.py
index 93f0c5624d..41d9233891 100644
--- a/eos/effects/skillbonuscapitalblasterspecialization.py
+++ b/eos/effects/skillbonuscapitalblasterspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Blaster Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Blaster Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Blaster Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuscapitalpulselaserspecialization.py b/eos/effects/skillbonuscapitalpulselaserspecialization.py
index d658a3ce1c..514eb5b2a0 100644
--- a/eos/effects/skillbonuscapitalpulselaserspecialization.py
+++ b/eos/effects/skillbonuscapitalpulselaserspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Pulse Laser Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Pulse Laser Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Pulse Laser Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuscapitalrailgunspecialization.py b/eos/effects/skillbonuscapitalrailgunspecialization.py
index f341c1e1a6..98d17a9bb5 100644
--- a/eos/effects/skillbonuscapitalrailgunspecialization.py
+++ b/eos/effects/skillbonuscapitalrailgunspecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Capital Railgun Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Railgun Specialization"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Railgun Specialization"),
+                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonusdoomsdayrapidfiring.py b/eos/effects/skillbonusdoomsdayrapidfiring.py
index 27c182a16a..89e206f6db 100644
--- a/eos/effects/skillbonusdoomsdayrapidfiring.py
+++ b/eos/effects/skillbonusdoomsdayrapidfiring.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Doomsday Rapid Firing
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Doomsday Operation"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Doomsday Operation"), "duration",
+                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/skillbonusdronedurability.py
index aa02619900..1023c8412a 100644
--- a/eos/effects/skillbonusdronedurability.py
+++ b/eos/effects/skillbonusdronedurability.py
@@ -3,9 +3,15 @@
 # Used by:
 # Skill: Drone Durability
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("hullHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("armorHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
+                                 src.getModifiedItemAttr("hullHpBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
+                                 src.getModifiedItemAttr("armorHpBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
+                                 src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/skillbonusdroneinterfacing.py
index a71416ce67..405435a714 100644
--- a/eos/effects/skillbonusdroneinterfacing.py
+++ b/eos/effects/skillbonusdroneinterfacing.py
@@ -3,10 +3,20 @@
 # Used by:
 # Skill: Drone Interfacing
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone", "miningDroneAmountPercent", src.getModifiedItemAttr("miningAmountBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
+                                 src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone", "miningDroneAmountPercent",
+                                 src.getModifiedItemAttr("miningAmountBonus") * lvl)
diff --git a/eos/effects/skillbonusdronenavigation.py b/eos/effects/skillbonusdronenavigation.py
index bcd65fb816..01453e8910 100644
--- a/eos/effects/skillbonusdronenavigation.py
+++ b/eos/effects/skillbonusdronenavigation.py
@@ -3,7 +3,11 @@
 # Used by:
 # Skill: Drone Navigation
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
+                                 src.getModifiedItemAttr("maxVelocityBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/skillbonusdronesharpshooting.py b/eos/effects/skillbonusdronesharpshooting.py
index 666ffed050..29654615c2 100644
--- a/eos/effects/skillbonusdronesharpshooting.py
+++ b/eos/effects/skillbonusdronesharpshooting.py
@@ -3,9 +3,17 @@
 # Used by:
 # Skill: Drone Sharpshooting
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange", src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange", src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus") * lvl)
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
+                                 src.getModifiedItemAttr("rangeSkillBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
+                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretRangeOptimal",
+                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileRangeOptimal",
+                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
diff --git a/eos/effects/skillbonusfighterhangarmanagement.py b/eos/effects/skillbonusfighterhangarmanagement.py
index 566a69d17e..8cf44cbe80 100644
--- a/eos/effects/skillbonusfighterhangarmanagement.py
+++ b/eos/effects/skillbonusfighterhangarmanagement.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Fighter Hangar Management
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
     fit.ship.boostItemAttr("fighterCapacity", src.getModifiedItemAttr("skillBonusFighterHangarSize") * lvl)
diff --git a/eos/effects/skillbonusfighters.py b/eos/effects/skillbonusfighters.py
index 7a362a6695..4d22c78aec 100644
--- a/eos/effects/skillbonusfighters.py
+++ b/eos/effects/skillbonusfighters.py
@@ -3,8 +3,16 @@
 # Used by:
 # Skill: Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonusfightersdamage.py b/eos/effects/skillbonusfightersdamage.py
index a887ab0c56..d9bc39cb38 100644
--- a/eos/effects/skillbonusfightersdamage.py
+++ b/eos/effects/skillbonusfightersdamage.py
@@ -3,8 +3,16 @@
 # Used by:
 # Skill: Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonusheavyfighters.py b/eos/effects/skillbonusheavyfighters.py
index ffbb419fc6..7c19ebb2d8 100644
--- a/eos/effects/skillbonusheavyfighters.py
+++ b/eos/effects/skillbonusheavyfighters.py
@@ -3,8 +3,16 @@
 # Used by:
 # Skill: Heavy Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonusheavyfightersdamage.py b/eos/effects/skillbonusheavyfightersdamage.py
index 786b1985ee..d5dcca51d8 100644
--- a/eos/effects/skillbonusheavyfightersdamage.py
+++ b/eos/effects/skillbonusheavyfightersdamage.py
@@ -3,8 +3,16 @@
 # Used by:
 # Skill: Heavy Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityAttackMissileDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityMissilesDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
+                                   "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/skillbonuslightfighters.py b/eos/effects/skillbonuslightfighters.py
index 9a2e0d014a..d41e214287 100644
--- a/eos/effects/skillbonuslightfighters.py
+++ b/eos/effects/skillbonuslightfighters.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Light Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/skillbonuslightfightersvelocity.py b/eos/effects/skillbonuslightfightersvelocity.py
index dfcb2dd6fb..4d254063a3 100644
--- a/eos/effects/skillbonuslightfightersvelocity.py
+++ b/eos/effects/skillbonuslightfightersvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Light Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity",
+                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/skillbonussupportfightersshield.py b/eos/effects/skillbonussupportfightersshield.py
index bfcb0360c9..d6758f2792 100644
--- a/eos/effects/skillbonussupportfightersshield.py
+++ b/eos/effects/skillbonussupportfightersshield.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Support Fighters
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "shieldCapacity", src.getModifiedItemAttr("shieldBonus") * lvl)
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shieldBonus") * lvl)
diff --git a/eos/effects/skillbonusxlcruisemissilespecialization.py b/eos/effects/skillbonusxlcruisemissilespecialization.py
index a2adfc7401..cc51709e35 100644
--- a/eos/effects/skillbonusxlcruisemissilespecialization.py
+++ b/eos/effects/skillbonusxlcruisemissilespecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: XL Cruise Missile Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missile Specialization"), "speed", src.getModifiedItemAttr("rofBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missile Specialization"), "speed",
+                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/skillbonusxltorpedospecialization.py b/eos/effects/skillbonusxltorpedospecialization.py
index af620d036e..7393d111e9 100644
--- a/eos/effects/skillbonusxltorpedospecialization.py
+++ b/eos/effects/skillbonusxltorpedospecialization.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: XL Torpedo Specialization
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedo Specialization"), "speed", src.getModifiedItemAttr("rofBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedo Specialization"), "speed",
+                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py b/eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py
index a7d4e44d1b..984efa65e0 100644
--- a/eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py
+++ b/eos/effects/skillcapitalremotehullrepairsystemscapneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Remote Hull Repair Systems
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Hull Repair Systems"),
                                   "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/skillcapitalshipsadvancedagility.py b/eos/effects/skillcapitalshipsadvancedagility.py
index e32f456c63..5a08463355 100644
--- a/eos/effects/skillcapitalshipsadvancedagility.py
+++ b/eos/effects/skillcapitalshipsadvancedagility.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Capital Ships
 type = "passive"
+
+
 def handler(fit, skill, context):
     if fit.ship.item.requiresSkill("Capital Ships"):
         fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus") * skill.level)
diff --git a/eos/effects/skillfighterbombersdmgbonus.py b/eos/effects/skillfighterbombersdmgbonus.py
index 8d51999630..2cbb0dda90 100644
--- a/eos/effects/skillfighterbombersdmgbonus.py
+++ b/eos/effects/skillfighterbombersdmgbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Fighter Bombers
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/skillfreightbonus.py b/eos/effects/skillfreightbonus.py
index 68d1637c30..93f4c33cf0 100644
--- a/eos/effects/skillfreightbonus.py
+++ b/eos/effects/skillfreightbonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Cargohold Optimization (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityBonus"))
diff --git a/eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py b/eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py
index 116bc51e45..e6b8f558bf 100644
--- a/eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py
+++ b/eos/effects/skillindustrialreconfigurationconsumptionquantitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Industrial Reconfiguration
 type = "passive"
+
+
 def handler(fit, skill, context):
     amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
diff --git a/eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py b/eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py
index e22b370d0e..5cb2d9654c 100644
--- a/eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py
+++ b/eos/effects/skilljumpdriveconsumptionamountbonuspercentage.py
@@ -3,5 +3,8 @@
 # Used by:
 # Skill: Jump Fuel Conservation
 type = "passive"
+
+
 def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", skill.getModifiedItemAttr("consumptionQuantityBonusPercentage") * skill.level)
\ No newline at end of file
+    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
+                           skill.getModifiedItemAttr("consumptionQuantityBonusPercentage") * skill.level)
diff --git a/eos/effects/skillmjddurationbonus.py b/eos/effects/skillmjddurationbonus.py
index 4a2224260e..ec949212a0 100644
--- a/eos/effects/skillmjddurationbonus.py
+++ b/eos/effects/skillmjddurationbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Micro Jump Drive Operation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
                                   "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/skillreactivearmorhardenercapneedbonus.py b/eos/effects/skillreactivearmorhardenercapneedbonus.py
index e377cd9a9d..22b9f94c4e 100644
--- a/eos/effects/skillreactivearmorhardenercapneedbonus.py
+++ b/eos/effects/skillreactivearmorhardenercapneedbonus.py
@@ -3,7 +3,11 @@
 # Used by:
 # Skill: Resistance Phasing
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed", src.getModifiedItemAttr("capNeedBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed", src.getModifiedItemAttr("capNeedBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed",
+                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed",
+                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
diff --git a/eos/effects/skillreactivearmorhardenerdurationbonus.py b/eos/effects/skillreactivearmorhardenerdurationbonus.py
index 45e4c0b912..9ecabd1cae 100644
--- a/eos/effects/skillreactivearmorhardenerdurationbonus.py
+++ b/eos/effects/skillreactivearmorhardenerdurationbonus.py
@@ -3,7 +3,11 @@
 # Used by:
 # Skill: Resistance Phasing
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration", src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration", src.getModifiedItemAttr("durationBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration",
+                                  src.getModifiedItemAttr("durationBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration",
+                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/skillremoteecmdurationbonus.py b/eos/effects/skillremoteecmdurationbonus.py
index 6f48b8369d..d2b13bdadf 100644
--- a/eos/effects/skillremoteecmdurationbonus.py
+++ b/eos/effects/skillremoteecmdurationbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Burst Projector Operation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors",
                                   "duration", skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
diff --git a/eos/effects/skillremotehullrepairsystemscapneedbonus.py b/eos/effects/skillremotehullrepairsystemscapneedbonus.py
index 181ab2239a..e5f173bbeb 100644
--- a/eos/effects/skillremotehullrepairsystemscapneedbonus.py
+++ b/eos/effects/skillremotehullrepairsystemscapneedbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Remote Hull Repair Systems
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Hull Repair Systems"),
                                   "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/skillsiegemoduleconsumptionquantitybonus.py b/eos/effects/skillsiegemoduleconsumptionquantitybonus.py
index ef8d522b52..119ed30728 100644
--- a/eos/effects/skillsiegemoduleconsumptionquantitybonus.py
+++ b/eos/effects/skillsiegemoduleconsumptionquantitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Tactical Weapon Reconfiguration
 type = "passive"
+
+
 def handler(fit, skill, context):
     amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
diff --git a/eos/effects/skillstructuredoomsdaydurationbonus.py b/eos/effects/skillstructuredoomsdaydurationbonus.py
index b7d8f10d1e..e5c0d43c1c 100644
--- a/eos/effects/skillstructuredoomsdaydurationbonus.py
+++ b/eos/effects/skillstructuredoomsdaydurationbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Structure Doomsday Operation
 type = "passive", "structure"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                    "duration", src.getModifiedItemAttr("durationBonus"), skill="Structure Doomsday Operation")
+                                  "duration", src.getModifiedItemAttr("durationBonus"),
+                                  skill="Structure Doomsday Operation")
diff --git a/eos/effects/skillstructureelectronicsystemscapneedbonus.py b/eos/effects/skillstructureelectronicsystemscapneedbonus.py
index cacffb6869..ee898cbc09 100644
--- a/eos/effects/skillstructureelectronicsystemscapneedbonus.py
+++ b/eos/effects/skillstructureelectronicsystemscapneedbonus.py
@@ -3,7 +3,10 @@
 # Used by:
 # Skill: Structure Electronic Systems
 type = "passive", "structure"
+
+
 def handler(fit, src, context):
     groups = ("Structure Warp Scrambler", "Structure Disruption Battery", "Structure Stasis Webifier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                    "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"), skill="Structure Electronic Systems")
+                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
+                                  skill="Structure Electronic Systems")
diff --git a/eos/effects/skillstructureengineeringsystemscapneedbonus.py b/eos/effects/skillstructureengineeringsystemscapneedbonus.py
index 91b0251765..c58dea119a 100644
--- a/eos/effects/skillstructureengineeringsystemscapneedbonus.py
+++ b/eos/effects/skillstructureengineeringsystemscapneedbonus.py
@@ -3,7 +3,10 @@
 # Used by:
 # Skill: Structure Engineering Systems
 type = "passive", "structure"
+
+
 def handler(fit, src, context):
     groups = ("Structure Energy Neutralizer", "Structure Area Denial Module")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                    "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"), skill="Structure Engineering Systems")
+                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
+                                  skill="Structure Engineering Systems")
diff --git a/eos/effects/skillstructuremissiledamagebonus.py b/eos/effects/skillstructuremissiledamagebonus.py
index 63b189a919..114a831b69 100644
--- a/eos/effects/skillstructuremissiledamagebonus.py
+++ b/eos/effects/skillstructuremissiledamagebonus.py
@@ -3,8 +3,11 @@
 # Used by:
 # Skill: Structure Missile Systems
 type = "passive", "structure"
+
+
 def handler(fit, src, context):
     groups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile", "Structure Guided Bomb")
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                        "%sDamage"%damageType, src.getModifiedItemAttr("damageMultiplierBonus"), skill="Structure Missile Systems")
+                                        "%sDamage" % damageType, src.getModifiedItemAttr("damageMultiplierBonus"),
+                                        skill="Structure Missile Systems")
diff --git a/eos/effects/skillsuperweapondmgbonus.py b/eos/effects/skillsuperweapondmgbonus.py
index e0ed11a434..e2952621fd 100644
--- a/eos/effects/skillsuperweapondmgbonus.py
+++ b/eos/effects/skillsuperweapondmgbonus.py
@@ -3,9 +3,12 @@
 # Used by:
 # Skill: Doomsday Operation
 type = "passive"
+
+
 def handler(fit, skill, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for dmgType in damageTypes:
         dmgAttr = "{0}Damage".format(dmgType)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Super Weapon" and dmgAttr in mod.itemModifiedAttributes,
-                                      dmgAttr, skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name == "Super Weapon" and dmgAttr in mod.itemModifiedAttributes,
+            dmgAttr, skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/skilltargetbreakercapneedbonus2.py b/eos/effects/skilltargetbreakercapneedbonus2.py
index d42e8bf1c1..1bd8dbdfe9 100644
--- a/eos/effects/skilltargetbreakercapneedbonus2.py
+++ b/eos/effects/skilltargetbreakercapneedbonus2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Target Breaker Amplification
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
                                   "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/skilltargetbreakerdurationbonus2.py b/eos/effects/skilltargetbreakerdurationbonus2.py
index 337c509c15..13cee98c81 100644
--- a/eos/effects/skilltargetbreakerdurationbonus2.py
+++ b/eos/effects/skilltargetbreakerdurationbonus2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Target Breaker Amplification
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
                                   "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/skilltriagemoduleconsumptionquantitybonus.py b/eos/effects/skilltriagemoduleconsumptionquantitybonus.py
index f7d482f385..3682128c18 100644
--- a/eos/effects/skilltriagemoduleconsumptionquantitybonus.py
+++ b/eos/effects/skilltriagemoduleconsumptionquantitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Tactical Logistics Reconfiguration
 type = "passive"
+
+
 def handler(fit, skill, context):
     amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
diff --git a/eos/effects/skirmishsquadroncommand.py b/eos/effects/skirmishsquadroncommand.py
index b5f343def3..d52708c7e3 100644
--- a/eos/effects/skirmishsquadroncommand.py
+++ b/eos/effects/skirmishsquadroncommand.py
@@ -4,6 +4,8 @@
 # Skill: Skirmish Warfare Specialist
 runTime = "early"
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/skirmishwarfareagilitybonus.py b/eos/effects/skirmishwarfareagilitybonus.py
index 9c20654824..d35cd2c239 100644
--- a/eos/effects/skirmishwarfareagilitybonus.py
+++ b/eos/effects/skirmishwarfareagilitybonus.py
@@ -5,6 +5,8 @@
 type = "gang"
 gangBoost = "agility"
 gangBonus = "agilityBonus"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level, stackingPenalties = True)
+    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus) * level, stackingPenalties=True)
diff --git a/eos/effects/skirmishwarfareagilitybonusreplacer.py b/eos/effects/skirmishwarfareagilitybonusreplacer.py
index 0968c14e57..e7b0263ee8 100644
--- a/eos/effects/skirmishwarfareagilitybonusreplacer.py
+++ b/eos/effects/skirmishwarfareagilitybonusreplacer.py
@@ -7,5 +7,7 @@
 type = "gang"
 gangBoost = "agility"
 gangBonus = "agilityBonus"
+
+
 def handler(fit, container, context):
     fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/slotmodifier.py b/eos/effects/slotmodifier.py
index 7ba0dee73f..f58f21d3b6 100644
--- a/eos/effects/slotmodifier.py
+++ b/eos/effects/slotmodifier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Items from category: Subsystem (80 of 80)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("hiSlots", module.getModifiedItemAttr("hiSlotModifier"))
     fit.ship.increaseItemAttr("medSlots", module.getModifiedItemAttr("medSlotModifier"))
diff --git a/eos/effects/smallenergymaxrangebonus.py b/eos/effects/smallenergymaxrangebonus.py
index 4e3ea5f317..4c13361f6d 100644
--- a/eos/effects/smallenergymaxrangebonus.py
+++ b/eos/effects/smallenergymaxrangebonus.py
@@ -5,6 +5,8 @@
 # Ship: Gold Magnate
 # Ship: Silver Magnate
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                   "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py b/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py
index 97ddbf511a..496efc986b 100644
--- a/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py
+++ b/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
 # Skill: Small Energy Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
diff --git a/eos/effects/smallhybridmaxrangebonus.py b/eos/effects/smallhybridmaxrangebonus.py
index ac39f763ee..86e95036d3 100644
--- a/eos/effects/smallhybridmaxrangebonus.py
+++ b/eos/effects/smallhybridmaxrangebonus.py
@@ -4,6 +4,8 @@
 # Ship: Catalyst
 # Ship: Cormorant
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
\ No newline at end of file
+                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py b/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py
index 42ecd683a1..f317f297b1 100644
--- a/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py
+++ b/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
 # Skill: Small Hybrid Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
diff --git a/eos/effects/smallprojectilemaxrangebonus.py b/eos/effects/smallprojectilemaxrangebonus.py
index d495785b39..b94e016be4 100644
--- a/eos/effects/smallprojectilemaxrangebonus.py
+++ b/eos/effects/smallprojectilemaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Thrasher
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                   "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py b/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py
index eac4416da6..a77f768065 100644
--- a/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py
+++ b/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py
@@ -4,6 +4,8 @@
 # Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
 # Skill: Small Projectile Turret
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
diff --git a/eos/effects/speedboostmassaddition.py b/eos/effects/speedboostmassaddition.py
index 950c1abb52..f2eb76ebea 100644
--- a/eos/effects/speedboostmassaddition.py
+++ b/eos/effects/speedboostmassaddition.py
@@ -4,6 +4,8 @@
 # Modules from group: Propulsion Module (62 of 127)
 type = "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
     speedBoost = module.getModifiedItemAttr("speedFactor")
diff --git a/eos/effects/speedboostmasssigrad.py b/eos/effects/speedboostmasssigrad.py
index 11051b5a9a..9bf213638a 100644
--- a/eos/effects/speedboostmasssigrad.py
+++ b/eos/effects/speedboostmasssigrad.py
@@ -4,10 +4,13 @@
 # Modules from group: Propulsion Module (65 of 127)
 type = "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
     speedBoost = module.getModifiedItemAttr("speedFactor")
     mass = fit.ship.getModifiedItemAttr("mass")
     thrust = module.getModifiedItemAttr("speedBoostFactor")
     fit.ship.boostItemAttr("maxVelocity", speedBoost * thrust / mass)
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"), stackingPenalties = True)
+    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"),
+                           stackingPenalties=True)
diff --git a/eos/effects/squadroncommand.py b/eos/effects/squadroncommand.py
index 19c6606a89..cf5939f9a1 100644
--- a/eos/effects/squadroncommand.py
+++ b/eos/effects/squadroncommand.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warfare Link Specialist
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gang Coordinator",
                                   "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/squadroncommandhidden.py b/eos/effects/squadroncommandhidden.py
index e42ccf645c..509541d05f 100644
--- a/eos/effects/squadroncommandhidden.py
+++ b/eos/effects/squadroncommandhidden.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Warfare Link Specialist
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gang Coordinator",
                                   "commandBonusHidden", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level)
diff --git a/eos/effects/standardmissilesskillboostmissilevelocitybonus.py b/eos/effects/standardmissilesskillboostmissilevelocitybonus.py
index 3728b052cd..f65a5bc341 100644
--- a/eos/effects/standardmissilesskillboostmissilevelocitybonus.py
+++ b/eos/effects/standardmissilesskillboostmissilevelocitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Defender Missiles
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)
\ No newline at end of file
+                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)
diff --git a/eos/effects/stripminermaxrangebonus.py b/eos/effects/stripminermaxrangebonus.py
index d7d1a86ff6..781f523f42 100644
--- a/eos/effects/stripminermaxrangebonus.py
+++ b/eos/effects/stripminermaxrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Implants named like: grade Harvest (10 of 12)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
                                   "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/structuralanalysiseffect.py b/eos/effects/structuralanalysiseffect.py
index 9cab58b3e6..de26cb71b5 100644
--- a/eos/effects/structuralanalysiseffect.py
+++ b/eos/effects/structuralanalysiseffect.py
@@ -6,6 +6,8 @@
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Implant: Imperial Navy Modified 'Noble' Implant
 type = "passive"
+
+
 def handler(fit, container, context):
     penalized = "implant" not in context
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
diff --git a/eos/effects/structureMissileGuidanceEnhancer.py b/eos/effects/structureMissileGuidanceEnhancer.py
index 3e06f44885..9a5516ada6 100644
--- a/eos/effects/structureMissileGuidanceEnhancer.py
+++ b/eos/effects/structureMissileGuidanceEnhancer.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Missile Guidance Enhancer (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     groups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
@@ -16,4 +18,4 @@ def handler(fit, module, context):
                                     stackingPenalties=True)
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                     "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"),
-                                    stackingPenalties=True)
\ No newline at end of file
+                                    stackingPenalties=True)
diff --git a/eos/effects/structureballisticcontrolsystem.py b/eos/effects/structureballisticcontrolsystem.py
index e63eb55d82..e075af277e 100644
--- a/eos/effects/structureballisticcontrolsystem.py
+++ b/eos/effects/structureballisticcontrolsystem.py
@@ -1,12 +1,15 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, module, context):
     missileGroups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
 
     for dmgType in ("em", "kinetic", "explosive", "thermal"):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
-                                    "%sDamage" % dmgType, module.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                    stackingPenalties = True)
+                                           "%sDamage" % dmgType,
+                                           module.getModifiedItemAttr("missileDamageMultiplierBonus"),
+                                           stackingPenalties=True)
 
     launcherGroups = ("Structure AXL Missile Launcher", "Structure ASML Missile Launcher")
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py
index 1281e1995a..8b6bf5846e 100644
--- a/eos/effects/structureenergyneutralizerfalloff.py
+++ b/eos/effects/structureenergyneutralizerfalloff.py
@@ -1,9 +1,13 @@
 # Not used by any item
 from eos.types import State
+
 type = "active", "projected"
+
+
 def handler(fit, container, context):
-    if "projected" in context and ((hasattr(container, "state") \
-    and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
+    amount = 0
+    if "projected" in context and ((hasattr(container, "state")
+                                    and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
         amount = container.getModifiedItemAttr("energyNeutralizerAmount")
-        time = container.getModifiedItemAttr("duration")
-        fit.addDrain(time, amount, 0)
+    time = container.getModifiedItemAttr("duration")
+    fit.addDrain(time, amount, 0)
diff --git a/eos/effects/structurehpmultiply.py b/eos/effects/structurehpmultiply.py
index aa7d43c7c6..33fc44bf60 100644
--- a/eos/effects/structurehpmultiply.py
+++ b/eos/effects/structurehpmultiply.py
@@ -5,5 +5,7 @@
 # Modules from group: Reinforced Bulkhead (8 of 8)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/structurehpmultiplypassive.py b/eos/effects/structurehpmultiplypassive.py
index 89ab600dfd..543cb488a7 100644
--- a/eos/effects/structurehpmultiplypassive.py
+++ b/eos/effects/structurehpmultiplypassive.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Expanded Cargohold (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
\ No newline at end of file
+    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/structuremoduleeffectecm.py b/eos/effects/structuremoduleeffectecm.py
index f8201dee14..9a39b452a0 100644
--- a/eos/effects/structuremoduleeffectecm.py
+++ b/eos/effects/structuremoduleeffectecm.py
@@ -1,8 +1,10 @@
 # Not used by any item
 type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" in context:
         # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType))/fit.scanStrength
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
 
         fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/structuremoduleeffectremotesensordampener.py b/eos/effects/structuremoduleeffectremotesensordampener.py
index 9734734bb6..7260ef623d 100644
--- a/eos/effects/structuremoduleeffectremotesensordampener.py
+++ b/eos/effects/structuremoduleeffectremotesensordampener.py
@@ -1,12 +1,14 @@
 # Not used by any item
 
-type= "projected", "active"
+type = "projected", "active"
+
+
 def handler(fit, module, context):
     if "projected" not in context:
         return
 
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
 
     fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/structuremoduleeffectstasiswebifier.py b/eos/effects/structuremoduleeffectstasiswebifier.py
index bc1a9d6a5d..dc4b6f046d 100644
--- a/eos/effects/structuremoduleeffectstasiswebifier.py
+++ b/eos/effects/structuremoduleeffectstasiswebifier.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "active", "projected"
+
+
 def handler(fit, module, context):
     if "projected" not in context: return
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties = True, remoteResists=True)
+                           stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/structuremoduleeffecttargetpainter.py b/eos/effects/structuremoduleeffecttargetpainter.py
index 4f5683d8ba..aac9005ba0 100644
--- a/eos/effects/structuremoduleeffecttargetpainter.py
+++ b/eos/effects/structuremoduleeffecttargetpainter.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties = True, remoteResists=True)
+                               stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/structuremoduleeffectweapondisruption.py b/eos/effects/structuremoduleeffectweapondisruption.py
index d61d74b113..82e67797e6 100644
--- a/eos/effects/structuremoduleeffectweapondisruption.py
+++ b/eos/effects/structuremoduleeffectweapondisruption.py
@@ -2,24 +2,25 @@
 
 type = "active", "projected"
 
+
 def handler(fit, module, context):
     if "projected" in context:
         for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
+                ("aoeCloudSizeBonus", "aoeCloudSize"),
+                ("aoeVelocityBonus", "aoeVelocity"),
+                ("missileVelocityBonus", "maxVelocity"),
+                ("explosionDelayBonus", "explosionDelay"),
         ):
             fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True, remoteResists=True)
+                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True, remoteResists=True)
 
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
         fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                       "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties = True, remoteResists=True)
+                                      stackingPenalties=True, remoteResists=True)
diff --git a/eos/effects/structurerepair.py b/eos/effects/structurerepair.py
index 2dcab2688a..40a88a2613 100644
--- a/eos/effects/structurerepair.py
+++ b/eos/effects/structurerepair.py
@@ -4,7 +4,9 @@
 # Modules from group: Hull Repair Unit (25 of 25)
 type = "active"
 runTime = "late"
+
+
 def handler(fit, module, context):
     amount = module.getModifiedItemAttr("structureDamageAmount")
     speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", amount / speed)
\ No newline at end of file
+    fit.extraAttributes.increase("hullRepair", amount / speed)
diff --git a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
index 36544fcf08..6d4503ec77 100644
--- a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
@@ -1,8 +1,10 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
 
     fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
-                                     "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
-                                     stackingPenalties=True)
+                                  "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigdoomsdaydamageloss.py b/eos/effects/structurerigdoomsdaydamageloss.py
index dc47880dd0..e2c6c613b8 100644
--- a/eos/effects/structurerigdoomsdaydamageloss.py
+++ b/eos/effects/structurerigdoomsdaydamageloss.py
@@ -1,5 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponDamageLossTarget", src.getModifiedItemAttr("structureRigDoomsdayDamageLossTargetBonus"))
+                                     "lightningWeaponDamageLossTarget",
+                                     src.getModifiedItemAttr("structureRigDoomsdayDamageLossTargetBonus"))
diff --git a/eos/effects/structurerigdoomsdaytargetamountbonus.py b/eos/effects/structurerigdoomsdaytargetamountbonus.py
index 5a521f9d0c..a68ca10545 100644
--- a/eos/effects/structurerigdoomsdaytargetamountbonus.py
+++ b/eos/effects/structurerigdoomsdaytargetamountbonus.py
@@ -1,5 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponTargetAmount", src.getModifiedItemAttr("structureRigDoomsdayTargetAmountBonus"))
+                                     "lightningWeaponTargetAmount",
+                                     src.getModifiedItemAttr("structureRigDoomsdayTargetAmountBonus"))
diff --git a/eos/effects/structurerigewcapacitorneed.py b/eos/effects/structurerigewcapacitorneed.py
index e74009e94a..dfeae5753c 100644
--- a/eos/effects/structurerigewcapacitorneed.py
+++ b/eos/effects/structurerigewcapacitorneed.py
@@ -1,7 +1,9 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     groups = ("Structure ECM Battery", "Structure Disruption Battery")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                     "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                     stackingPenalties=True)
\ No newline at end of file
+                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigewmaxrangefalloff.py b/eos/effects/structurerigewmaxrangefalloff.py
index 660aa53b98..fa6ed13c95 100644
--- a/eos/effects/structurerigewmaxrangefalloff.py
+++ b/eos/effects/structurerigewmaxrangefalloff.py
@@ -1,16 +1,18 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     groups = ("Structure ECM Battery", "Structure Disruption Battery")
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                     "falloff", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                     stackingPenalties=True)
+                                  "falloff", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
+                                  stackingPenalties=True)
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                     "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                     stackingPenalties=True)
+                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
+                                  stackingPenalties=True)
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                     "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                     stackingPenalties=True)
\ No newline at end of file
+                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
index 82e306a8ed..34e840638c 100644
--- a/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
+++ b/eos/effects/structurerigexplosionradiusbonusaoemissiles.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                     "aoeCloudSize", src.getModifiedItemAttr("structureRigMissileExplosionRadiusBonus"),
-                                     stackingPenalties=True)
+                                    "aoeCloudSize", src.getModifiedItemAttr("structureRigMissileExplosionRadiusBonus"),
+                                    stackingPenalties=True)
diff --git a/eos/effects/structurerigmaxtargets.py b/eos/effects/structurerigmaxtargets.py
index d7444bf10e..d7b5ecfe5e 100644
--- a/eos/effects/structurerigmaxtargets.py
+++ b/eos/effects/structurerigmaxtargets.py
@@ -1,4 +1,6 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("structureRigMaxTargetBonus"))
diff --git a/eos/effects/structurerigneutralizercapacitorneed.py b/eos/effects/structurerigneutralizercapacitorneed.py
index dd99761b26..c570161fa5 100644
--- a/eos/effects/structurerigneutralizercapacitorneed.py
+++ b/eos/effects/structurerigneutralizercapacitorneed.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                     "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                     stackingPenalties=True)
+                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
index ebe35be6f9..d123e02782 100644
--- a/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
+++ b/eos/effects/structurerigneutralizermaxrangefalloffeffectiveness.py
@@ -1,10 +1,12 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                     "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                     stackingPenalties=True)
+                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
+                                  stackingPenalties=True)
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                 "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                 stackingPenalties=True)
+                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigpdbcapacitorneed.py b/eos/effects/structurerigpdbcapacitorneed.py
index 273ddedeb0..a32e63ecc0 100644
--- a/eos/effects/structurerigpdbcapacitorneed.py
+++ b/eos/effects/structurerigpdbcapacitorneed.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                     "capacitorNeed", src.getModifiedItemAttr("structureRigPDCapUseBonus"),
-                                     stackingPenalties=True)
+                                  "capacitorNeed", src.getModifiedItemAttr("structureRigPDCapUseBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigpdbmaxrange.py b/eos/effects/structurerigpdbmaxrange.py
index 5c822c1030..64994bf26c 100644
--- a/eos/effects/structurerigpdbmaxrange.py
+++ b/eos/effects/structurerigpdbmaxrange.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                     "empFieldRange", src.getModifiedItemAttr("structureRigPDRangeBonus"),
-                                     stackingPenalties=True)
+                                  "empFieldRange", src.getModifiedItemAttr("structureRigPDRangeBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurerigsensorresolution.py b/eos/effects/structurerigsensorresolution.py
index e037fc4ea6..8d68050e67 100644
--- a/eos/effects/structurerigsensorresolution.py
+++ b/eos/effects/structurerigsensorresolution.py
@@ -1,4 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"), stackingPenalties=True)
+    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"),
+                           stackingPenalties=True)
diff --git a/eos/effects/structurerigvelocitybonusaoemissiles.py b/eos/effects/structurerigvelocitybonusaoemissiles.py
index 5ffd336f8c..636134b1f8 100644
--- a/eos/effects/structurerigvelocitybonusaoemissiles.py
+++ b/eos/effects/structurerigvelocitybonusaoemissiles.py
@@ -1,6 +1,8 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                     "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                     stackingPenalties=True)
+                                    "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
+                                    stackingPenalties=True)
diff --git a/eos/effects/structurerigvelocitybonussingletargetmissiles.py b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
index ebece903c1..1af82afd05 100644
--- a/eos/effects/structurerigvelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
@@ -1,7 +1,9 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
     fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
-                                       "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                       stackingPenalties=True)
+                                  "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
+                                  stackingPenalties=True)
diff --git a/eos/effects/structurestealthemitterarraysigdecrease.py b/eos/effects/structurestealthemitterarraysigdecrease.py
index ec2140edfd..c7e19707f2 100644
--- a/eos/effects/structurestealthemitterarraysigdecrease.py
+++ b/eos/effects/structurestealthemitterarraysigdecrease.py
@@ -4,5 +4,7 @@
 # Implants named like: X Instinct Booster (4 of 4)
 # Implants named like: grade Halo (15 of 18)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.ship.boostItemAttr("signatureRadius", implant.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
index be42de8eee..27bf8932d0 100644
--- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py
@@ -1,8 +1,9 @@
+from eos.types import State
+
 # Not used by any item
 runTime = "early"
 type = "projected", "active"
 
-from eos.types import State
 
 def handler(fit, module, context):
     if "projected" not in context:
diff --git a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
index fa0c9a3e86..931ff01909 100644
--- a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
+++ b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Adaptive Augmenter
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems")
+                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive2"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py b/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
index b58cf75219..371873ede5 100644
--- a/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensivearmorhp.py b/eos/effects/subsystembonusamarrdefensivearmorhp.py
index 73eb74a9ef..d289286678 100644
--- a/eos/effects/subsystembonusamarrdefensivearmorhp.py
+++ b/eos/effects/subsystembonusamarrdefensivearmorhp.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Defensive - Augmented Plating
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                           skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py b/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py
index 79b4176b1f..27bb5924be 100644
--- a/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py
+++ b/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Nanobot Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensivearmorresistance.py b/eos/effects/subsystembonusamarrdefensivearmorresistance.py
index d032065e3e..0f4538f810 100644
--- a/eos/effects/subsystembonusamarrdefensivearmorresistance.py
+++ b/eos/effects/subsystembonusamarrdefensivearmorresistance.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Legion Defensive - Adaptive Augmenter
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type),
+                               module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                               skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
index 0abc92ceec..2464c35a8b 100644
--- a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
index c41e0ee700..c4bda3b182 100644
--- a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
index 7ba436d078..0eb183b089 100644
--- a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py b/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py
index d27d3e8da6..9e8d6b3076 100644
--- a/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py
+++ b/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems")
+    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"),
+                           skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronic2scanresolution.py b/eos/effects/subsystembonusamarrelectronic2scanresolution.py
index 781e98f495..ec1ecc2d8b 100644
--- a/eos/effects/subsystembonusamarrelectronic2scanresolution.py
+++ b/eos/effects/subsystembonusamarrelectronic2scanresolution.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Electronics - Tactical Targeting Network
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems")
+    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"),
+                           skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py b/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py
index becc360d46..ebad7b7fa8 100644
--- a/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py
+++ b/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"),
+                                  skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py
index 5b2e8e97c7..125a00d964 100644
--- a/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py
+++ b/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems")
+                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"),
+                                  skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
index ba29f0b272..fc4295af18 100644
--- a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
+++ b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Legion Electronics - Energy Parasitic Complex
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
+                                  "energyNeutralizerAmount",
+                                  module.getModifiedItemAttr("subsystemBonusAmarrElectronic"),
+                                  skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
index 080d3dc929..3c38706750 100644
--- a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
+++ b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Electronics - Energy Parasitic Complex
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
+                                  "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"),
+                                  skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronicscanprobestrength.py b/eos/effects/subsystembonusamarrelectronicscanprobestrength.py
index 4d3c514a81..094bc05b5a 100644
--- a/eos/effects/subsystembonusamarrelectronicscanprobestrength.py
+++ b/eos/effects/subsystembonusamarrelectronicscanprobestrength.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
+                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"),
+                                    skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py b/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py
index 1f5b85ce09..ed1e64b139 100644
--- a/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py
+++ b/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanRadarStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
+    fit.ship.boostItemAttr("scanRadarStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"),
+                           skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py b/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py
index 574478596c..421f22d835 100644
--- a/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py
+++ b/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Engineering - Augmented Capacitor Reservoir
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems")
+    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"),
+                           skill="Amarr Engineering Systems")
diff --git a/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py b/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py
index ff816724a6..644a4f1fb6 100644
--- a/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py
+++ b/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Engineering - Capacitor Regeneration Matrix
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems")
+    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"),
+                           skill="Amarr Engineering Systems")
diff --git a/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py b/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py
index bc77e22d15..b055780341 100644
--- a/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py
+++ b/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Engineering - Supplemental Coolant Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems")
+                                  module.getModifiedItemAttr("subsystemBonusAmarrEngineering"),
+                                  skill="Amarr Engineering Systems")
diff --git a/eos/effects/subsystembonusamarrengineeringpoweroutput.py b/eos/effects/subsystembonusamarrengineeringpoweroutput.py
index 5640abcf69..7c7de3bd49 100644
--- a/eos/effects/subsystembonusamarrengineeringpoweroutput.py
+++ b/eos/effects/subsystembonusamarrengineeringpoweroutput.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Engineering - Power Core Multiplier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems")
+    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"),
+                           skill="Amarr Engineering Systems")
diff --git a/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py b/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py
index 2f06ecf2a9..804fc8461b 100644
--- a/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py
+++ b/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py
@@ -4,6 +4,9 @@
 # Subsystem: Legion Offensive - Drone Synthesis Projector
 # Subsystem: Legion Offensive - Liquid Crystal Magnifiers
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
+                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive2hamemdamage.py b/eos/effects/subsystembonusamarroffensive2hamemdamage.py
index 8178a10a10..efc2542a7a 100644
--- a/eos/effects/subsystembonusamarroffensive2hamemdamage.py
+++ b/eos/effects/subsystembonusamarroffensive2hamemdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
+                                    "emDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
+                                    skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py b/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py
index f06ee21e82..ff23e5c756 100644
--- a/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py
+++ b/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
+                                    "explosiveDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
+                                    skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py b/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py
index 1fb68f0c81..7e77264767 100644
--- a/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py
+++ b/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
+                                    "kineticDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
+                                    skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py b/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py
index a8d181181f..f62bfe09bf 100644
--- a/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py
+++ b/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
+                                    "thermalDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
+                                    skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive3dronehp.py b/eos/effects/subsystembonusamarroffensive3dronehp.py
index 9ca93b3749..5160060df5 100644
--- a/eos/effects/subsystembonusamarroffensive3dronehp.py
+++ b/eos/effects/subsystembonusamarroffensive3dronehp.py
@@ -3,7 +3,10 @@
 # Used by:
 # Subsystem: Legion Offensive - Drone Synthesis Projector
 type = "passive"
+
+
 def handler(fit, module, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer,
-                                     module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
+                                     module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"),
+                                     skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py b/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py
index 80546ed467..7d001910c2 100644
--- a/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py
+++ b/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Liquid Crystal Magnifiers
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py
index bd48e2863d..fe66e0d40a 100644
--- a/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py b/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py
index 8891c8e231..44b1d4f830 100644
--- a/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py
+++ b/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Drone Synthesis Projector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                 "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                 skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py b/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py
index 09b73187fe..4e6fc9d4cb 100644
--- a/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py
+++ b/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Covert Reconfiguration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py b/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py
index 07dddee5a6..3af29dfee3 100644
--- a/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py
+++ b/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Liquid Crystal Magnifiers
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py
index 00ffeca45a..a857c5f511 100644
--- a/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py
index 5feee607cf..9a1ef28803 100644
--- a/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py
+++ b/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Offensive - Assault Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
+                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py
index ac4e700572..d1dc758883 100644
--- a/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py
+++ b/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Propulsion - Fuel Catalyst
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
+                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
+                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/subsystembonusamarrpropulsionagility.py b/eos/effects/subsystembonusamarrpropulsionagility.py
index a2d9dfd563..cdc25a7dd9 100644
--- a/eos/effects/subsystembonusamarrpropulsionagility.py
+++ b/eos/effects/subsystembonusamarrpropulsionagility.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Propulsion - Interdiction Nullifier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
+                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py b/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py
index 05b68be1e4..2f928cbac9 100644
--- a/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py
+++ b/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Legion Propulsion - Chassis Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
+    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
+                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py b/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py
index 2276cff1d9..46a48e5a1d 100644
--- a/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py
+++ b/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Legion Propulsion - Wake Limiter
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
+                                  "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
+                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
index d267413eb7..ab944172d0 100644
--- a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
+++ b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Adaptive Shielding
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), skill="Caldari Defensive Systems")
+                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
index 2274054948..b9ea652ff8 100644
--- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
index 36ba1f089e..1cd7950272 100644
--- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py b/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py
index 69edfb54d8..da6f96f0bf 100644
--- a/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py
+++ b/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Amplification Node
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldhp.py b/eos/effects/subsystembonuscaldaridefensiveshieldhp.py
index a1596527d0..50ce1043f9 100644
--- a/eos/effects/subsystembonuscaldaridefensiveshieldhp.py
+++ b/eos/effects/subsystembonuscaldaridefensiveshieldhp.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Defensive - Supplemental Screening
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+    fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                           skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py b/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py
index 791898df70..938a268dad 100644
--- a/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py
+++ b/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Defensive - Supplemental Screening
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), skill="Caldari Defensive Systems")
+    fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
+                           skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py b/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py
index 5b010063af..993f99f57a 100644
--- a/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py
+++ b/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Tengu Defensive - Adaptive Shielding
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+        fit.ship.boostItemAttr("shield{0}DamageResonance".format(type),
+                               module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                               skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py b/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
index 83bd125dcb..9895e87538 100644
--- a/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
index f6cc7baa22..8ed05b0f04 100644
--- a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py b/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py
index bd6a0ff8f0..760d0025c9 100644
--- a/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py
+++ b/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems")
+    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"),
+                           skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py b/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py
index 0f34eae81b..d61fde3b56 100644
--- a/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py
+++ b/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"),
+                                  skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py b/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py
index 225e6ddb04..e03dbaa497 100644
--- a/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py
+++ b/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems")
+                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"),
+                                  skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectroniccpu.py b/eos/effects/subsystembonuscaldarielectroniccpu.py
index 69c3556036..c44cdcb138 100644
--- a/eos/effects/subsystembonuscaldarielectroniccpu.py
+++ b/eos/effects/subsystembonuscaldarielectroniccpu.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Electronics - CPU Efficiency Gate
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems")
+    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"),
+                           skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronicecmrange.py b/eos/effects/subsystembonuscaldarielectronicecmrange.py
index 768edca0a8..23e2f7f3b3 100644
--- a/eos/effects/subsystembonuscaldarielectronicecmrange.py
+++ b/eos/effects/subsystembonuscaldarielectronicecmrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Electronics - Obfuscation Manifold
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"),
+                                  skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py b/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py
index 5e7ce9b7d8..21ee1b739d 100644
--- a/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py
+++ b/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems")
+                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"),
+                                    skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py b/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py
index a6f0ba498f..6f3ca9d9b2 100644
--- a/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py
+++ b/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems")
+    fit.ship.boostItemAttr("scanGravimetricStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"),
+                           skill="Caldari Electronic Systems")
diff --git a/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py b/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py
index 7d8aa2bafe..0e2fb09079 100644
--- a/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py
+++ b/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Engineering - Augmented Capacitor Reservoir
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems")
+    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"),
+                           skill="Caldari Engineering Systems")
diff --git a/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py b/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py
index fd4a3737aa..f3948124e6 100644
--- a/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py
+++ b/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Engineering - Capacitor Regeneration Matrix
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems")
+    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"),
+                           skill="Caldari Engineering Systems")
diff --git a/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py b/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py
index e694e066d9..1b15f7e14a 100644
--- a/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py
+++ b/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Engineering - Supplemental Coolant Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems")
+                                  module.getModifiedItemAttr("subsystemBonusCaldariEngineering"),
+                                  skill="Caldari Engineering Systems")
diff --git a/eos/effects/subsystembonuscaldariengineeringpoweroutput.py b/eos/effects/subsystembonuscaldariengineeringpoweroutput.py
index 1f21a67a41..e8728f95a3 100644
--- a/eos/effects/subsystembonuscaldariengineeringpoweroutput.py
+++ b/eos/effects/subsystembonuscaldariengineeringpoweroutput.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Engineering - Power Core Multiplier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems")
+    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"),
+                           skill="Caldari Engineering Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py b/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py
index ac961adc7b..830e6ae1b2 100644
--- a/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py
+++ b/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Offensive - Magnetic Infusion Basin
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), skill="Caldari Offensive Systems")
+                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py
index 1065c574cb..b5b72630f9 100644
--- a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py
+++ b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Offensive - Accelerated Ejection Bay
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), skill="Caldari Offensive Systems")
+                                    "kineticDamage", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
+                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py
index 94afe30adb..0c6955c2db 100644
--- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py
+++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Tengu Offensive - Rifling Launcher Pattern
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                  "scanGravimetricStrengthBonus",
+                                  module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py
index 658b651938..1169f9a597 100644
--- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py
+++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Tengu Offensive - Rifling Launcher Pattern
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                  "scanLadarStrengthBonus",
+                                  module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py
index 6ffa0dc1e9..543c6df176 100644
--- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py
+++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Tengu Offensive - Rifling Launcher Pattern
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                  "scanMagnetometricStrengthBonus",
+                                  module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py
index d985751d64..499dac6731 100644
--- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py
+++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Tengu Offensive - Rifling Launcher Pattern
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                  "scanRadarStrengthBonus",
+                                  module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py b/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py
index 5593d54749..b595798d8c 100644
--- a/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py
+++ b/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Offensive - Accelerated Ejection Bay
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                    "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py b/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py
index 3476f6cd0d..6e74ab51d5 100644
--- a/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py
+++ b/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Offensive - Accelerated Ejection Bay
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems")
+                                    "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
+                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py
index cf89e487f3..02d2d3d035 100644
--- a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py
index c454946075..be291c9faf 100644
--- a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py
index 79fde47fb8..5a4533caed 100644
--- a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py
+++ b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py b/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py
index 6d3f59b739..a2d51c0878 100644
--- a/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py
+++ b/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Offensive - Magnetic Infusion Basin
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
+                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py b/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py
index b9d9f76b96..9841d27a70 100644
--- a/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py
+++ b/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Propulsion - Gravitational Capacitor
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"), skill="Caldari Propulsion Systems")
+    fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
+                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py
index d30dc62a56..c97944920e 100644
--- a/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py
+++ b/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Tengu Propulsion - Fuel Catalyst
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems")
+                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
+                                  skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsionagility.py b/eos/effects/subsystembonuscaldaripropulsionagility.py
index 29c2b72f7b..987ba772f2 100644
--- a/eos/effects/subsystembonuscaldaripropulsionagility.py
+++ b/eos/effects/subsystembonuscaldaripropulsionagility.py
@@ -4,5 +4,8 @@
 # Subsystem: Tengu Propulsion - Intercalated Nanofibers
 # Subsystem: Tengu Propulsion - Interdiction Nullifier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems")
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
+                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py b/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py
index 0d7ee884a7..e79971ba02 100644
--- a/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py
+++ b/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Tengu Propulsion - Gravitational Capacitor
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems")
+    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
+                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
index 25c8650577..9c880d09dd 100644
--- a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
+++ b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Adaptive Augmenter
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
+                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive2"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
index d48c4da757..cf7793af53 100644
--- a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensivearmorhp.py b/eos/effects/subsystembonusgallentedefensivearmorhp.py
index 4316696170..e200be1210 100644
--- a/eos/effects/subsystembonusgallentedefensivearmorhp.py
+++ b/eos/effects/subsystembonusgallentedefensivearmorhp.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Defensive - Augmented Plating
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                           skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py b/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py
index c3110e4e5f..5b17e24611 100644
--- a/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py
+++ b/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Nanobot Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensivearmorresistance.py b/eos/effects/subsystembonusgallentedefensivearmorresistance.py
index 2b7809ae3d..8bab5687df 100644
--- a/eos/effects/subsystembonusgallentedefensivearmorresistance.py
+++ b/eos/effects/subsystembonusgallentedefensivearmorresistance.py
@@ -3,7 +3,10 @@
 # Used by:
 # Subsystem: Proteus Defensive - Adaptive Augmenter
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(type),
-                               module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                               module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                               skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
index d6086d313e..5858333dbd 100644
--- a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
index adbf1a301d..8775a86ca4 100644
--- a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
+++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                                  "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
index c527157084..2dd011b947 100644
--- a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py b/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py
index 7da45acd22..78a87857e1 100644
--- a/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py
+++ b/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems")
+    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"),
+                           skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py b/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py
index 8dfab20d79..98ecbc4ea3 100644
--- a/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py
+++ b/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"),
+                                  skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py
index 6ca9ea2504..203b50abc7 100644
--- a/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py
+++ b/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems")
+                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"),
+                                  skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectroniccpu.py b/eos/effects/subsystembonusgallenteelectroniccpu.py
index 9eac793a5f..ec58320952 100644
--- a/eos/effects/subsystembonusgallenteelectroniccpu.py
+++ b/eos/effects/subsystembonusgallenteelectroniccpu.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Electronics - CPU Efficiency Gate
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems")
+    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"),
+                           skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py b/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py
index 3a4bd3292e..ab62cd4c78 100644
--- a/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py
+++ b/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Proteus Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems")
+                                    "baseSensorStrength",
+                                    module.getModifiedItemAttr("subsystemBonusGallenteElectronic"),
+                                    skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py b/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py
index 8c371cc8ff..e8fa6ac5ee 100644
--- a/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py
+++ b/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems")
+    fit.ship.boostItemAttr("scanMagnetometricStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"),
+                           skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py b/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py
index 9947ef45de..cdb0629b4a 100644
--- a/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py
+++ b/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Electronics - Friction Extension Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"),
+                                  skill="Gallente Electronic Systems")
diff --git a/eos/effects/subsystembonusgallenteengineering2dronemwd.py b/eos/effects/subsystembonusgallenteengineering2dronemwd.py
index 17777c1b54..78e5270762 100644
--- a/eos/effects/subsystembonusgallenteengineering2dronemwd.py
+++ b/eos/effects/subsystembonusgallenteengineering2dronemwd.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Engineering - Augmented Capacitor Reservoir
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), "maxVelocity",
-                                 module.getModifiedItemAttr("subsystemBonusGallenteEngineering2"), skill="Gallente Engineering Systems")
+                                 module.getModifiedItemAttr("subsystemBonusGallenteEngineering2"),
+                                 skill="Gallente Engineering Systems")
diff --git a/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py b/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py
index f338010059..c687f9439e 100644
--- a/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py
+++ b/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Engineering - Capacitor Regeneration Matrix
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems")
+    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"),
+                           skill="Gallente Engineering Systems")
diff --git a/eos/effects/subsystembonusgallenteengineeringdronehp.py b/eos/effects/subsystembonusgallenteengineeringdronehp.py
index 2de1c3b93b..11af8f065c 100644
--- a/eos/effects/subsystembonusgallenteengineeringdronehp.py
+++ b/eos/effects/subsystembonusgallenteengineeringdronehp.py
@@ -3,7 +3,10 @@
 # Used by:
 # Subsystem: Proteus Engineering - Augmented Capacitor Reservoir
 type = "passive"
+
+
 def handler(fit, module, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer,
-                                     module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems")
+                                     module.getModifiedItemAttr("subsystemBonusGallenteEngineering"),
+                                     skill="Gallente Engineering Systems")
diff --git a/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py b/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py
index 0d0e988967..0f62a1aaca 100644
--- a/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py
+++ b/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Engineering - Supplemental Coolant Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems")
+                                  module.getModifiedItemAttr("subsystemBonusGallenteEngineering"),
+                                  skill="Gallente Engineering Systems")
diff --git a/eos/effects/subsystembonusgallenteengineeringpoweroutput.py b/eos/effects/subsystembonusgallenteengineeringpoweroutput.py
index 7deea9d0c7..5b22286ffd 100644
--- a/eos/effects/subsystembonusgallenteengineeringpoweroutput.py
+++ b/eos/effects/subsystembonusgallenteengineeringpoweroutput.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Engineering - Power Core Multiplier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems")
+    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"),
+                           skill="Gallente Engineering Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py
index 3708570308..e0a1c96ce5 100644
--- a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py
+++ b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Variations of subsystem: Proteus Offensive - Dissonic Encoding Platform (3 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), skill="Gallente Offensive Systems")
+                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
+                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py
index 05d7f77c3f..fc71b41c82 100644
--- a/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py
+++ b/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Offensive - Drone Synthesis Projector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems")
+                                 "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"),
+                                 skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensive3turrettracking.py b/eos/effects/subsystembonusgallenteoffensive3turrettracking.py
index 20fc3544ea..4c73b4548c 100644
--- a/eos/effects/subsystembonusgallenteoffensive3turrettracking.py
+++ b/eos/effects/subsystembonusgallenteoffensive3turrettracking.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Offensive - Dissonic Encoding Platform
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems")
+                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"),
+                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensivedronehp.py b/eos/effects/subsystembonusgallenteoffensivedronehp.py
index 8fd52fbed5..d02eab9544 100644
--- a/eos/effects/subsystembonusgallenteoffensivedronehp.py
+++ b/eos/effects/subsystembonusgallenteoffensivedronehp.py
@@ -3,7 +3,10 @@
 # Used by:
 # Subsystem: Proteus Offensive - Drone Synthesis Projector
 type = "passive"
+
+
 def handler(fit, module, context):
     for layer in ("shieldCapacity", "armorHP", "hp"):
         fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer,
-                                     module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
+                                     module.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
+                                     skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py
index be39a23e0e..e547892dde 100644
--- a/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py
+++ b/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Offensive - Covert Reconfiguration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
+                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
+                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py b/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py
index e75bbe6863..e2366d8aa3 100644
--- a/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py
+++ b/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py
@@ -4,6 +4,9 @@
 # Subsystem: Proteus Offensive - Dissonic Encoding Platform
 # Subsystem: Proteus Offensive - Hybrid Propulsion Armature
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
+                                  "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
+                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py b/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py
index ecb625ece4..7edf667117 100644
--- a/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py
+++ b/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Propulsion - Gravitational Capacitor
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion2"), skill="Gallente Propulsion Systems")
+    fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
+                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py b/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py
index 7c8955146e..7a9b3fed0a 100644
--- a/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py
+++ b/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Proteus Propulsion - Localized Injectors
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems")
+                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
+                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsionagility.py b/eos/effects/subsystembonusgallentepropulsionagility.py
index bb37162440..509c0cdf02 100644
--- a/eos/effects/subsystembonusgallentepropulsionagility.py
+++ b/eos/effects/subsystembonusgallentepropulsionagility.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Propulsion - Interdiction Nullifier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems")
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
+                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py b/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py
index ec8701f986..cbe61bbd8f 100644
--- a/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py
+++ b/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Proteus Propulsion - Wake Limiter
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems")
+                                  "signatureRadiusBonus",
+                                  module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
+                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsionwarpspeed.py b/eos/effects/subsystembonusgallentepropulsionwarpspeed.py
index 53bcf1d006..aca750fb99 100644
--- a/eos/effects/subsystembonusgallentepropulsionwarpspeed.py
+++ b/eos/effects/subsystembonusgallentepropulsionwarpspeed.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Proteus Propulsion - Gravitational Capacitor
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems")
+    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
+                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
index 349d30c515..674a715971 100644
--- a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
+++ b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Defensive - Adaptive Shielding
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
+                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"),
+                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
index 373b7607fe..486e5b71be 100644
--- a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
+++ b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensivearmorresistance.py b/eos/effects/subsystembonusminmatardefensivearmorresistance.py
index 3fac3a9a38..ebb814db8f 100644
--- a/eos/effects/subsystembonusminmatardefensivearmorresistance.py
+++ b/eos/effects/subsystembonusminmatardefensivearmorresistance.py
@@ -3,7 +3,10 @@
 # Used by:
 # Subsystem: Loki Defensive - Adaptive Augmenter
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(type),
-                               module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+                               module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                               skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensiveshieldresistance.py b/eos/effects/subsystembonusminmatardefensiveshieldresistance.py
index 30d5ec983c..b757188d65 100644
--- a/eos/effects/subsystembonusminmatardefensiveshieldresistance.py
+++ b/eos/effects/subsystembonusminmatardefensiveshieldresistance.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Loki Defensive - Adaptive Shielding
 type = "passive"
+
+
 def handler(fit, module, context):
     for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+        fit.ship.boostItemAttr("shield{0}DamageResonance".format(type),
+                               module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                               skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py
index 0690fde43d..81b69e5d27 100644
--- a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py
+++ b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensivesignatureradius.py b/eos/effects/subsystembonusminmatardefensivesignatureradius.py
index d4731e8b83..bb251a4011 100644
--- a/eos/effects/subsystembonusminmatardefensivesignatureradius.py
+++ b/eos/effects/subsystembonusminmatardefensivesignatureradius.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Defensive - Amplification Node
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                           skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py b/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
index f21b398422..2448c91066 100644
--- a/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
+++ b/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Defensive - Warfare Processor
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems")
+                                  "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
+                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py b/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py
index fe4986a7cf..eceb16039d 100644
--- a/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py
+++ b/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems")
+    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"),
+                           skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronic2scanresolution.py b/eos/effects/subsystembonusminmatarelectronic2scanresolution.py
index 94a58f4e37..c997f8d1b8 100644
--- a/eos/effects/subsystembonusminmatarelectronic2scanresolution.py
+++ b/eos/effects/subsystembonusminmatarelectronic2scanresolution.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Electronics - Tactical Targeting Network
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems")
+    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"),
+                           skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py b/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py
index 17a8867f21..e8540a9ae3 100644
--- a/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py
+++ b/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"),
+                                  skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py
index 4e7eefc04e..7d77dc87f3 100644
--- a/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py
+++ b/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems")
+                                  "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"),
+                                  skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py b/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py
index b9f91387bb..9f86dfb397 100644
--- a/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py
+++ b/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py
@@ -3,6 +3,10 @@
 # Used by:
 # Subsystem: Loki Electronics - Emergent Locus Analyzer
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems")
+                                    "baseSensorStrength",
+                                    module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"),
+                                    skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py b/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py
index 407ebef132..0afef69e96 100644
--- a/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py
+++ b/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Electronics - Dissolution Sequencer
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanLadarStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems")
+    fit.ship.boostItemAttr("scanLadarStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"),
+                           skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py b/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py
index e0eb629c89..f942c6c416 100644
--- a/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py
+++ b/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Electronics - Immobility Drivers
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"),
+                                  skill="Minmatar Electronic Systems")
diff --git a/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py b/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py
index 7302b91498..fc6f35c14b 100644
--- a/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py
+++ b/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Engineering - Augmented Capacitor Reservoir
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems")
+    fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"),
+                           skill="Minmatar Engineering Systems")
diff --git a/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py b/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py
index 231e7b86ec..9dea1085d0 100644
--- a/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py
+++ b/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Engineering - Capacitor Regeneration Matrix
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems")
+    fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"),
+                           skill="Minmatar Engineering Systems")
diff --git a/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py b/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py
index d66dcc378c..3e7164127b 100644
--- a/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py
+++ b/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Engineering - Supplemental Coolant Injector
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems")
+                                  module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"),
+                                  skill="Minmatar Engineering Systems")
diff --git a/eos/effects/subsystembonusminmatarengineeringpoweroutput.py b/eos/effects/subsystembonusminmatarengineeringpoweroutput.py
index b54d6413dd..d943d6cc08 100644
--- a/eos/effects/subsystembonusminmatarengineeringpoweroutput.py
+++ b/eos/effects/subsystembonusminmatarengineeringpoweroutput.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Engineering - Power Core Multiplier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems")
+    fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"),
+                           skill="Minmatar Engineering Systems")
diff --git a/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py b/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py
index 468ec49060..d2bc64c9d0 100644
--- a/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py
+++ b/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Turret Concurrence Registry
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems")
+                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py b/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py
index fcae6bbf86..954901316e 100644
--- a/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py
+++ b/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py
@@ -4,6 +4,9 @@
 # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration
 # Subsystem: Loki Offensive - Projectile Scoping Array
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensive3turrettracking.py b/eos/effects/subsystembonusminmataroffensive3turrettracking.py
index 5a3a693f29..f5cc5467dd 100644
--- a/eos/effects/subsystembonusminmataroffensive3turrettracking.py
+++ b/eos/effects/subsystembonusminmataroffensive3turrettracking.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Turret Concurrence Registry
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"), skill="Minmatar Offensive Systems")
+                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py
index 2b42b19a07..1dd73939b4 100644
--- a/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py
index ed45887c39..64b4d799bf 100644
--- a/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py
+++ b/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py
index e9c64b241d..30b021d602 100644
--- a/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py
+++ b/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py
index 636023d12c..e971984988 100644
--- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py
+++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Projectile Scoping Array
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py
index d90ff14f2c..9ec21ec5bd 100644
--- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py
+++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Turret Concurrence Registry
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py
index d7ec0fc3de..516fdde4a9 100644
--- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py
+++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Offensive - Covert Reconfiguration
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
+                                  "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
+                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py
index da593a70f9..14ab976693 100644
--- a/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py
+++ b/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py
@@ -3,6 +3,9 @@
 # Used by:
 # Subsystem: Loki Propulsion - Fuel Catalyst
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems")
+                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
+                                  skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/subsystembonusminmatarpropulsionagility.py b/eos/effects/subsystembonusminmatarpropulsionagility.py
index 347692df7e..e6bfa201a7 100644
--- a/eos/effects/subsystembonusminmatarpropulsionagility.py
+++ b/eos/effects/subsystembonusminmatarpropulsionagility.py
@@ -4,5 +4,8 @@
 # Subsystem: Loki Propulsion - Intercalated Nanofibers
 # Subsystem: Loki Propulsion - Interdiction Nullifier
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems")
+    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
+                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py b/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py
index a43ce9df81..1a4dcb51a2 100644
--- a/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py
+++ b/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py
@@ -3,5 +3,8 @@
 # Used by:
 # Subsystem: Loki Propulsion - Chassis Optimization
 type = "passive"
+
+
 def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems")
+    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
+                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/subsystembonusoffensivejumpharmonics.py b/eos/effects/subsystembonusoffensivejumpharmonics.py
index 256e8ed1c4..aab0f23348 100644
--- a/eos/effects/subsystembonusoffensivejumpharmonics.py
+++ b/eos/effects/subsystembonusoffensivejumpharmonics.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.forceItemAttr("jumpHarmonics", module.getModifiedItemAttr("jumpHarmonicsModifier"))
diff --git a/eos/effects/subsystembonusscanprobelaunchercpu.py b/eos/effects/subsystembonusscanprobelaunchercpu.py
index 3e78481ae3..0b62b23b8d 100644
--- a/eos/effects/subsystembonusscanprobelaunchercpu.py
+++ b/eos/effects/subsystembonusscanprobelaunchercpu.py
@@ -3,6 +3,8 @@
 # Used by:
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Scan Probe Launcher",
                                   "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/subsystembonuswarpbubbleimmune.py b/eos/effects/subsystembonuswarpbubbleimmune.py
index bb87a10f54..cd29dad702 100644
--- a/eos/effects/subsystembonuswarpbubbleimmune.py
+++ b/eos/effects/subsystembonuswarpbubbleimmune.py
@@ -3,5 +3,7 @@
 # Used by:
 # Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.forceItemAttr("warpBubbleImmune", module.getModifiedItemAttr("warpBubbleImmuneModifier"))
diff --git a/eos/effects/superweaponamarr.py b/eos/effects/superweaponamarr.py
index 0295fe8cd2..dfc06475e2 100644
--- a/eos/effects/superweaponamarr.py
+++ b/eos/effects/superweaponamarr.py
@@ -3,5 +3,7 @@
 # Used by:
 # Module: 'Judgment' Electromagnetic Doomsday
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/superweaponcaldari.py b/eos/effects/superweaponcaldari.py
index a7e8874b3a..a7ea155e2d 100644
--- a/eos/effects/superweaponcaldari.py
+++ b/eos/effects/superweaponcaldari.py
@@ -3,5 +3,7 @@
 # Used by:
 # Module: 'Oblivion' Kinetic Doomsday
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/superweapongallente.py b/eos/effects/superweapongallente.py
index 8f1a060757..21d330213d 100644
--- a/eos/effects/superweapongallente.py
+++ b/eos/effects/superweapongallente.py
@@ -3,5 +3,7 @@
 # Used by:
 # Module: 'Aurora Ominae' Thermal Doomsday
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/superweaponminmatar.py b/eos/effects/superweaponminmatar.py
index f3e3709577..25b0b57efb 100644
--- a/eos/effects/superweaponminmatar.py
+++ b/eos/effects/superweaponminmatar.py
@@ -3,5 +3,7 @@
 # Used by:
 # Module: 'Gjallarhorn' Explosive Doomsday
 type = 'active'
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py
index 721c9f9112..ce79c7ea8a 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupenergyweapon.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Surgical Strike
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
                                   "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py
index be65514b9d..2ead8310e9 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgrouphybridweapon.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Surgical Strike
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                   "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py
index 6542f0238b..5cd9e697b7 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipgroupprojectileweapon.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Surgical Strike
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
                                   "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
index c33420947d..a255e8a790 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -4,6 +4,8 @@
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 # Implant: Standard Cerebral Accelerator
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                   "damageMultiplier", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py
index 78f04d5ff8..d28e30f768 100644
--- a/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py
@@ -5,6 +5,8 @@
 # Implants named like: Zainou 'Deadeye' Trajectory Analysis TA (6 of 6)
 # Skill: Trajectory Analysis
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py
index 7ae8c3dc53..6dcf933fd3 100644
--- a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py
+++ b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py
@@ -4,6 +4,8 @@
 # Modules named like: Signal Focusing Kit (8 of 8)
 # Skill: Survey
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
diff --git a/eos/effects/systemagility.py b/eos/effects/systemagility.py
index 0e3158c5d1..ce8ba7370d 100644
--- a/eos/effects/systemagility.py
+++ b/eos/effects/systemagility.py
@@ -4,5 +4,7 @@
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/systemaoecloudsize.py b/eos/effects/systemaoecloudsize.py
index 33183dcd71..e8e4e9b0ce 100644
--- a/eos/effects/systemaoecloudsize.py
+++ b/eos/effects/systemaoecloudsize.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                     "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"))
+                                       "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"))
diff --git a/eos/effects/systemaoevelocity.py b/eos/effects/systemaoevelocity.py
index c9a568f890..3ea6fea6cf 100644
--- a/eos/effects/systemaoevelocity.py
+++ b/eos/effects/systemaoevelocity.py
@@ -4,6 +4,8 @@
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "aoeVelocity", beacon.getModifiedItemAttr("aoeVelocityMultiplier"))
diff --git a/eos/effects/systemarmoremresistance.py b/eos/effects/systemarmoremresistance.py
index 20db294de9..901d4f7f8d 100644
--- a/eos/effects/systemarmoremresistance.py
+++ b/eos/effects/systemarmoremresistance.py
@@ -5,6 +5,8 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.boostItemAttr("armorEmDamageResonance", beacon.getModifiedItemAttr("armorEmDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemarmorexplosiveresistance.py b/eos/effects/systemarmorexplosiveresistance.py
index 01548413d2..ccd8104d53 100644
--- a/eos/effects/systemarmorexplosiveresistance.py
+++ b/eos/effects/systemarmorexplosiveresistance.py
@@ -5,6 +5,9 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", beacon.getModifiedItemAttr("armorExplosiveDamageResistanceBonus"),
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance",
+                           beacon.getModifiedItemAttr("armorExplosiveDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemarmorhp.py b/eos/effects/systemarmorhp.py
index c40db3037c..05a3f91ab4 100644
--- a/eos/effects/systemarmorhp.py
+++ b/eos/effects/systemarmorhp.py
@@ -4,5 +4,7 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("armorHP", beacon.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/systemarmorkineticresistance.py b/eos/effects/systemarmorkineticresistance.py
index 21c426f3a2..845b03da6b 100644
--- a/eos/effects/systemarmorkineticresistance.py
+++ b/eos/effects/systemarmorkineticresistance.py
@@ -5,6 +5,9 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", beacon.getModifiedItemAttr("armorKineticDamageResistanceBonus"),
+    fit.ship.boostItemAttr("armorKineticDamageResonance",
+                           beacon.getModifiedItemAttr("armorKineticDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/systemarmorremoterepairamount.py
index 288ccfefde..4c18e85898 100644
--- a/eos/effects/systemarmorremoterepairamount.py
+++ b/eos/effects/systemarmorremoterepairamount.py
@@ -4,7 +4,10 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
+                                     "armorDamageAmount",
+                                     module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
                                      stackingPenalties=True)
diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/systemarmorrepairamount.py
index 5ba4e2aa13..1b28168f13 100644
--- a/eos/effects/systemarmorrepairamount.py
+++ b/eos/effects/systemarmorrepairamount.py
@@ -4,8 +4,10 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Repair Systems")
-                                              or mod.item.requiresSkill("Capital Repair Systems"),
+                                                 or mod.item.requiresSkill("Capital Repair Systems"),
                                      "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemarmorthermalresistance.py b/eos/effects/systemarmorthermalresistance.py
index 4c06d397b2..0a5eb0be6c 100644
--- a/eos/effects/systemarmorthermalresistance.py
+++ b/eos/effects/systemarmorthermalresistance.py
@@ -5,6 +5,9 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", beacon.getModifiedItemAttr("armorThermalDamageResistanceBonus"),
+    fit.ship.boostItemAttr("armorThermalDamageResonance",
+                           beacon.getModifiedItemAttr("armorThermalDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemcapacitorcapacity.py b/eos/effects/systemcapacitorcapacity.py
index 4cc9d40a55..63a57c9e23 100644
--- a/eos/effects/systemcapacitorcapacity.py
+++ b/eos/effects/systemcapacitorcapacity.py
@@ -4,5 +4,7 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("capacitorCapacity", beacon.getModifiedItemAttr("capacitorCapacityMultiplierSystem"))
diff --git a/eos/effects/systemcapacitorrecharge.py b/eos/effects/systemcapacitorrecharge.py
index 21750d5d42..dd89728edb 100644
--- a/eos/effects/systemcapacitorrecharge.py
+++ b/eos/effects/systemcapacitorrecharge.py
@@ -5,5 +5,7 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("rechargeRate", beacon.getModifiedItemAttr("rechargeRateMultiplier"))
diff --git a/eos/effects/systemdamagedrones.py b/eos/effects/systemdamagedrones.py
index dc85ce0ae4..6e4cac6f49 100644
--- a/eos/effects/systemdamagedrones.py
+++ b/eos/effects/systemdamagedrones.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamageembombs.py b/eos/effects/systemdamageembombs.py
index 760f5eb445..e81ca6fd37 100644
--- a/eos/effects/systemdamageembombs.py
+++ b/eos/effects/systemdamageembombs.py
@@ -4,7 +4,9 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
+                                       "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemdamageemmissiles.py b/eos/effects/systemdamageemmissiles.py
index 34d12f2bce..6a9485f886 100644
--- a/eos/effects/systemdamageemmissiles.py
+++ b/eos/effects/systemdamageemmissiles.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamageexplosivebombs.py b/eos/effects/systemdamageexplosivebombs.py
index c3057cb812..11cc26d960 100644
--- a/eos/effects/systemdamageexplosivebombs.py
+++ b/eos/effects/systemdamageexplosivebombs.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                        "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
diff --git a/eos/effects/systemdamageexplosivemissiles.py b/eos/effects/systemdamageexplosivemissiles.py
index e8c224f08e..da1cfab947 100644
--- a/eos/effects/systemdamageexplosivemissiles.py
+++ b/eos/effects/systemdamageexplosivemissiles.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamagefighters.py b/eos/effects/systemdamagefighters.py
index 63e02a9992..2718a3789e 100644
--- a/eos/effects/systemdamagefighters.py
+++ b/eos/effects/systemdamagefighters.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Fighters"),
                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamagekineticbombs.py b/eos/effects/systemdamagekineticbombs.py
index 152e2b71ab..7fb67a6fb0 100644
--- a/eos/effects/systemdamagekineticbombs.py
+++ b/eos/effects/systemdamagekineticbombs.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
                                        "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
diff --git a/eos/effects/systemdamagekineticmissiles.py b/eos/effects/systemdamagekineticmissiles.py
index 293f5873c5..7609052aaf 100644
--- a/eos/effects/systemdamagekineticmissiles.py
+++ b/eos/effects/systemdamagekineticmissiles.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamagemultipliergunnery.py b/eos/effects/systemdamagemultipliergunnery.py
index 1b6e32aa1d..3b701166a9 100644
--- a/eos/effects/systemdamagemultipliergunnery.py
+++ b/eos/effects/systemdamagemultipliergunnery.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdamagethermalbombs.py b/eos/effects/systemdamagethermalbombs.py
index 8293ee78c6..675b1adb5f 100644
--- a/eos/effects/systemdamagethermalbombs.py
+++ b/eos/effects/systemdamagethermalbombs.py
@@ -4,7 +4,9 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
+                                       "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemdamagethermalmissiles.py b/eos/effects/systemdamagethermalmissiles.py
index 86187101a9..ada3a084a7 100644
--- a/eos/effects/systemdamagethermalmissiles.py
+++ b/eos/effects/systemdamagethermalmissiles.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
diff --git a/eos/effects/systemdronetracking.py b/eos/effects/systemdronetracking.py
index 941d70749e..f5800c0704 100644
--- a/eos/effects/systemdronetracking.py
+++ b/eos/effects/systemdronetracking.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.drones.filteredItemMultiply(lambda drone: True,
                                     "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"),
diff --git a/eos/effects/systemenergyneutmultiplier.py b/eos/effects/systemenergyneutmultiplier.py
index 6c3e7b5afa..a5ff4dbb09 100644
--- a/eos/effects/systemenergyneutmultiplier.py
+++ b/eos/effects/systemenergyneutmultiplier.py
@@ -4,7 +4,10 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                     "energyNeutralizerAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
+                                     "energyNeutralizerAmount",
+                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemenergyvampiremultiplier.py b/eos/effects/systemenergyvampiremultiplier.py
index 15a634762a..0cb05180aa 100644
--- a/eos/effects/systemenergyvampiremultiplier.py
+++ b/eos/effects/systemenergyvampiremultiplier.py
@@ -4,7 +4,10 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                     "powerTransferAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
+                                     "powerTransferAmount",
+                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemgravimetricecmbomb.py b/eos/effects/systemgravimetricecmbomb.py
index 42c8d5c923..6d04ccf969 100644
--- a/eos/effects/systemgravimetricecmbomb.py
+++ b/eos/effects/systemgravimetricecmbomb.py
@@ -4,7 +4,10 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "scanGravimetricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
+                                       "scanGravimetricStrengthBonus",
+                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemheatdamage.py b/eos/effects/systemheatdamage.py
index eb016f647b..3b31dc1789 100644
--- a/eos/effects/systemheatdamage.py
+++ b/eos/effects/systemheatdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "heatDamage" in mod.itemModifiedAttributes,
                                      "heatDamage", module.getModifiedItemAttr("heatDamageMultiplier"))
diff --git a/eos/effects/systemladarecmbomb.py b/eos/effects/systemladarecmbomb.py
index daa0780a58..b5dfc2a985 100644
--- a/eos/effects/systemladarecmbomb.py
+++ b/eos/effects/systemladarecmbomb.py
@@ -4,7 +4,10 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "scanLadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
+                                       "scanLadarStrengthBonus",
+                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemmagnetrometricecmbomb.py b/eos/effects/systemmagnetrometricecmbomb.py
index d9d51f07c8..a9a15ec79c 100644
--- a/eos/effects/systemmagnetrometricecmbomb.py
+++ b/eos/effects/systemmagnetrometricecmbomb.py
@@ -4,7 +4,10 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                     "scanMagnetometricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
+                                       "scanMagnetometricStrengthBonus",
+                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemmaxvelocity.py b/eos/effects/systemmaxvelocity.py
index 012136c8c5..b10fbf8eb4 100644
--- a/eos/effects/systemmaxvelocity.py
+++ b/eos/effects/systemmaxvelocity.py
@@ -4,5 +4,8 @@
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True, penaltyGroup="postMul")
+    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"),
+                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemmaxvelocitypercentage.py b/eos/effects/systemmaxvelocitypercentage.py
index 36b0f6280e..133fb7e7a0 100644
--- a/eos/effects/systemmaxvelocitypercentage.py
+++ b/eos/effects/systemmaxvelocitypercentage.py
@@ -4,5 +4,7 @@
 # Celestials named like: Drifter Incursion (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.boostItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/systemmissilevelocity.py b/eos/effects/systemmissilevelocity.py
index 7e4d0f5996..9870b420df 100644
--- a/eos/effects/systemmissilevelocity.py
+++ b/eos/effects/systemmissilevelocity.py
@@ -4,6 +4,8 @@
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
                                        "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"),
diff --git a/eos/effects/systemneutbombs.py b/eos/effects/systemneutbombs.py
index 4bdadf12bc..333b3eb56a 100644
--- a/eos/effects/systemneutbombs.py
+++ b/eos/effects/systemneutbombs.py
@@ -4,7 +4,10 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "energyNeutralizerAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       "energyNeutralizerAmount",
+                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
                                        stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemoverloadarmor.py b/eos/effects/systemoverloadarmor.py
index 1ce7a9e66e..d70cb74d0f 100644
--- a/eos/effects/systemoverloadarmor.py
+++ b/eos/effects/systemoverloadarmor.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadArmorDamageAmount" in mod.itemModifiedAttributes,
                                      "overloadArmorDamageAmount", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloaddamagemodifier.py b/eos/effects/systemoverloaddamagemodifier.py
index 5f75370994..886aa68655 100644
--- a/eos/effects/systemoverloaddamagemodifier.py
+++ b/eos/effects/systemoverloaddamagemodifier.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadDamageModifier" in mod.itemModifiedAttributes,
                                      "overloadDamageModifier", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloaddurationbonus.py b/eos/effects/systemoverloaddurationbonus.py
index e612af53c9..7fe9d6e12b 100644
--- a/eos/effects/systemoverloaddurationbonus.py
+++ b/eos/effects/systemoverloaddurationbonus.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadDurationBonus" in mod.itemModifiedAttributes,
                                      "overloadDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadeccmstrength.py b/eos/effects/systemoverloadeccmstrength.py
index e032ed52f9..06cd0a1e99 100644
--- a/eos/effects/systemoverloadeccmstrength.py
+++ b/eos/effects/systemoverloadeccmstrength.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadECCMStrenghtBonus" in mod.itemModifiedAttributes,
                                      "overloadECCMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadecmstrength.py b/eos/effects/systemoverloadecmstrength.py
index b61e36e54a..8f71dd81c2 100644
--- a/eos/effects/systemoverloadecmstrength.py
+++ b/eos/effects/systemoverloadecmstrength.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadECMStrenghtBonus" in mod.itemModifiedAttributes,
                                      "overloadECMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadhardening.py b/eos/effects/systemoverloadhardening.py
index 96f20ec17f..5d65dfc30d 100644
--- a/eos/effects/systemoverloadhardening.py
+++ b/eos/effects/systemoverloadhardening.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadHardeningBonus" in mod.itemModifiedAttributes,
                                      "overloadHardeningBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadrange.py b/eos/effects/systemoverloadrange.py
index 76912f5e3d..9714406935 100644
--- a/eos/effects/systemoverloadrange.py
+++ b/eos/effects/systemoverloadrange.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadRangeBonus" in mod.itemModifiedAttributes,
                                      "overloadRangeBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadrof.py b/eos/effects/systemoverloadrof.py
index bdc8fdb5a3..139c684df8 100644
--- a/eos/effects/systemoverloadrof.py
+++ b/eos/effects/systemoverloadrof.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadRofBonus" in mod.itemModifiedAttributes,
                                      "overloadRofBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadselfduration.py b/eos/effects/systemoverloadselfduration.py
index 46ba2d01b2..397c9a00c1 100644
--- a/eos/effects/systemoverloadselfduration.py
+++ b/eos/effects/systemoverloadselfduration.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadSelfDurationBonus" in mod.itemModifiedAttributes,
                                      "overloadSelfDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadshieldbonus.py b/eos/effects/systemoverloadshieldbonus.py
index 359f92d187..d468f3cd60 100644
--- a/eos/effects/systemoverloadshieldbonus.py
+++ b/eos/effects/systemoverloadshieldbonus.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadShieldBonus" in mod.itemModifiedAttributes,
                                      "overloadShieldBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemoverloadspeedfactor.py b/eos/effects/systemoverloadspeedfactor.py
index b2e4a098a6..a766bbaa84 100644
--- a/eos/effects/systemoverloadspeedfactor.py
+++ b/eos/effects/systemoverloadspeedfactor.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: "overloadSpeedFactorBonus" in mod.itemModifiedAttributes,
                                      "overloadSpeedFactorBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/systemradarecmbomb.py b/eos/effects/systemradarecmbomb.py
index b7fb110bff..444ae4fe7d 100644
--- a/eos/effects/systemradarecmbomb.py
+++ b/eos/effects/systemradarecmbomb.py
@@ -4,7 +4,10 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanRadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
+                                       "scanRadarStrengthBonus",
+                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
                                        stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemremotecaptransmitteramount.py b/eos/effects/systemremotecaptransmitteramount.py
index df0166d28f..af78de47a4 100644
--- a/eos/effects/systemremotecaptransmitteramount.py
+++ b/eos/effects/systemremotecaptransmitteramount.py
@@ -4,6 +4,8 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
                                      "powerTransferAmount", beacon.getModifiedItemAttr("energyTransferAmountBonus"),
diff --git a/eos/effects/systemrocketemdamage.py b/eos/effects/systemrocketemdamage.py
index 0284ef7e91..b49384777a 100644
--- a/eos/effects/systemrocketemdamage.py
+++ b/eos/effects/systemrocketemdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                        "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemrocketexplosivedamage.py b/eos/effects/systemrocketexplosivedamage.py
index 3c636a444c..db6d6653ed 100644
--- a/eos/effects/systemrocketexplosivedamage.py
+++ b/eos/effects/systemrocketexplosivedamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                        "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemrocketkineticdamage.py b/eos/effects/systemrocketkineticdamage.py
index f91272907b..3b539502cb 100644
--- a/eos/effects/systemrocketkineticdamage.py
+++ b/eos/effects/systemrocketkineticdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                        "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemrocketthermaldamage.py b/eos/effects/systemrocketthermaldamage.py
index a6b5306952..db5f65c0f5 100644
--- a/eos/effects/systemrocketthermaldamage.py
+++ b/eos/effects/systemrocketthermaldamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
                                        "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemscandurationmodulemodifier.py b/eos/effects/systemscandurationmodulemodifier.py
index 19fbeaed33..bf561c4a29 100644
--- a/eos/effects/systemscandurationmodulemodifier.py
+++ b/eos/effects/systemscandurationmodulemodifier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Scanning Upgrade Time (2 of 2)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
                                   "duration", module.getModifiedItemAttr("scanDurationBonus"))
diff --git a/eos/effects/systemscandurationskillastrometrics.py b/eos/effects/systemscandurationskillastrometrics.py
index 32bcd3610a..16c26d3734 100644
--- a/eos/effects/systemscandurationskillastrometrics.py
+++ b/eos/effects/systemscandurationskillastrometrics.py
@@ -5,6 +5,8 @@
 # Skill: Astrometric Acquisition
 # Skill: Astrometrics
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
diff --git a/eos/effects/systemshieldemresistance.py b/eos/effects/systemshieldemresistance.py
index b5b7d3bfa0..8e373b52d8 100644
--- a/eos/effects/systemshieldemresistance.py
+++ b/eos/effects/systemshieldemresistance.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", beacon.getModifiedItemAttr("shieldEmDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemshieldexplosiveresistance.py b/eos/effects/systemshieldexplosiveresistance.py
index 54d1a97a86..cc52e57234 100644
--- a/eos/effects/systemshieldexplosiveresistance.py
+++ b/eos/effects/systemshieldexplosiveresistance.py
@@ -4,6 +4,9 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", beacon.getModifiedItemAttr("shieldExplosiveDamageResistanceBonus"),
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance",
+                           beacon.getModifiedItemAttr("shieldExplosiveDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemshieldhp.py b/eos/effects/systemshieldhp.py
index bede89d713..ffe1b68736 100644
--- a/eos/effects/systemshieldhp.py
+++ b/eos/effects/systemshieldhp.py
@@ -4,5 +4,7 @@
 # Celestials named like: Pulsar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("shieldCapacity", beacon.getModifiedItemAttr("shieldCapacityMultiplier"))
diff --git a/eos/effects/systemshieldkineticresistance.py b/eos/effects/systemshieldkineticresistance.py
index 780e109728..7671d6d13f 100644
--- a/eos/effects/systemshieldkineticresistance.py
+++ b/eos/effects/systemshieldkineticresistance.py
@@ -4,6 +4,9 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", beacon.getModifiedItemAttr("shieldKineticDamageResistanceBonus"),
+    fit.ship.boostItemAttr("shieldKineticDamageResonance",
+                           beacon.getModifiedItemAttr("shieldKineticDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/systemshieldremoterepairamount.py
index 5c2edef34d..c8dd296453 100644
--- a/eos/effects/systemshieldremoterepairamount.py
+++ b/eos/effects/systemshieldremoterepairamount.py
@@ -4,6 +4,8 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                      "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/systemshieldrepairamountshieldskills.py
index 40dc3377d9..bde28cd046 100644
--- a/eos/effects/systemshieldrepairamountshieldskills.py
+++ b/eos/effects/systemshieldrepairamountshieldskills.py
@@ -4,8 +4,10 @@
 # Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation")
-                                              or mod.item.requiresSkill("Capital Shield Operation"),
+                                                 or mod.item.requiresSkill("Capital Shield Operation"),
                                      "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemshieldthermalresistance.py b/eos/effects/systemshieldthermalresistance.py
index ff18eaca27..cd58fcdebf 100644
--- a/eos/effects/systemshieldthermalresistance.py
+++ b/eos/effects/systemshieldthermalresistance.py
@@ -4,6 +4,9 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", beacon.getModifiedItemAttr("shieldThermalDamageResistanceBonus"),
+    fit.ship.boostItemAttr("shieldThermalDamageResonance",
+                           beacon.getModifiedItemAttr("shieldThermalDamageResistanceBonus"),
                            stackingPenalties=True)
diff --git a/eos/effects/systemsignatureradius.py b/eos/effects/systemsignatureradius.py
index 25d67f2175..f00bb35be4 100644
--- a/eos/effects/systemsignatureradius.py
+++ b/eos/effects/systemsignatureradius.py
@@ -5,6 +5,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"),
                               stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemsmallenergydamage.py b/eos/effects/systemsmallenergydamage.py
index a260eaf78a..d4fd391245 100644
--- a/eos/effects/systemsmallenergydamage.py
+++ b/eos/effects/systemsmallenergydamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
                                      "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemsmallhybriddamage.py b/eos/effects/systemsmallhybriddamage.py
index d727e6c885..fedc2f2cf0 100644
--- a/eos/effects/systemsmallhybriddamage.py
+++ b/eos/effects/systemsmallhybriddamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
                                      "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemsmallprojectiledamage.py b/eos/effects/systemsmallprojectiledamage.py
index 6cc11e8d56..089c03d461 100644
--- a/eos/effects/systemsmallprojectiledamage.py
+++ b/eos/effects/systemsmallprojectiledamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
                                      "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemsmartbombemdamage.py b/eos/effects/systemsmartbombemdamage.py
index 6e9d8c6a4b..da11e810c7 100644
--- a/eos/effects/systemsmartbombemdamage.py
+++ b/eos/effects/systemsmartbombemdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
                                      "emDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/systemsmartbombexplosivedamage.py b/eos/effects/systemsmartbombexplosivedamage.py
index f0bbcd2770..d52964bca2 100644
--- a/eos/effects/systemsmartbombexplosivedamage.py
+++ b/eos/effects/systemsmartbombexplosivedamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
                                      "explosiveDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/systemsmartbombkineticdamage.py b/eos/effects/systemsmartbombkineticdamage.py
index 9b03e08061..1e7cf7c44f 100644
--- a/eos/effects/systemsmartbombkineticdamage.py
+++ b/eos/effects/systemsmartbombkineticdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
                                      "kineticDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/systemsmartbombrange.py b/eos/effects/systemsmartbombrange.py
index 02912bdfc1..5ccdc6f786 100644
--- a/eos/effects/systemsmartbombrange.py
+++ b/eos/effects/systemsmartbombrange.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
                                      "empFieldRange", module.getModifiedItemAttr("empFieldRangeMultiplier"))
diff --git a/eos/effects/systemsmartbombthermaldamage.py b/eos/effects/systemsmartbombthermaldamage.py
index 94344a5874..a12281fe2b 100644
--- a/eos/effects/systemsmartbombthermaldamage.py
+++ b/eos/effects/systemsmartbombthermaldamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Red Giant Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
                                      "thermalDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/systemstandardmissileemdamage.py b/eos/effects/systemstandardmissileemdamage.py
index 2dcadb7b92..5e6102aef4 100644
--- a/eos/effects/systemstandardmissileemdamage.py
+++ b/eos/effects/systemstandardmissileemdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                        "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemstandardmissileexplosivedamage.py b/eos/effects/systemstandardmissileexplosivedamage.py
index 60d790ce9c..c53978cf5c 100644
--- a/eos/effects/systemstandardmissileexplosivedamage.py
+++ b/eos/effects/systemstandardmissileexplosivedamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                        "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemstandardmissilekineticdamage.py b/eos/effects/systemstandardmissilekineticdamage.py
index f7e454bdc5..51c946fec6 100644
--- a/eos/effects/systemstandardmissilekineticdamage.py
+++ b/eos/effects/systemstandardmissilekineticdamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                        "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemstandardmissilethermaldamage.py b/eos/effects/systemstandardmissilethermaldamage.py
index 68dfff8b92..db5e7d254b 100644
--- a/eos/effects/systemstandardmissilethermaldamage.py
+++ b/eos/effects/systemstandardmissilethermaldamage.py
@@ -4,6 +4,8 @@
 # Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
                                        "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
diff --git a/eos/effects/systemtargetingrange.py b/eos/effects/systemtargetingrange.py
index 8e1bc01872..b54077e9dd 100644
--- a/eos/effects/systemtargetingrange.py
+++ b/eos/effects/systemtargetingrange.py
@@ -5,6 +5,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"),
                               stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemtargetpaintermultiplier.py b/eos/effects/systemtargetpaintermultiplier.py
index b7f02c2a44..898111db93 100644
--- a/eos/effects/systemtargetpaintermultiplier.py
+++ b/eos/effects/systemtargetpaintermultiplier.py
@@ -4,7 +4,10 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                     "signatureRadiusBonus", beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"),
+                                     "signatureRadiusBonus",
+                                     beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemtracking.py b/eos/effects/systemtracking.py
index 652d6f2ebd..6aff80eb7c 100644
--- a/eos/effects/systemtracking.py
+++ b/eos/effects/systemtracking.py
@@ -4,6 +4,8 @@
 # Celestials named like: Magnetar Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
diff --git a/eos/effects/systemwebifierstrengthmultiplier.py b/eos/effects/systemwebifierstrengthmultiplier.py
index 7e190e51f6..f45dca9213 100644
--- a/eos/effects/systemwebifierstrengthmultiplier.py
+++ b/eos/effects/systemwebifierstrengthmultiplier.py
@@ -4,6 +4,8 @@
 # Celestials named like: Black Hole Effect Beacon Class (6 of 6)
 runTime = "early"
 type = ("projected", "passive")
+
+
 def handler(fit, beacon, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Stasis Web",
                                      "speedFactor", beacon.getModifiedItemAttr("stasisWebStrengthMultiplier"),
diff --git a/eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py b/eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py
index 97a499467e..2c281449c3 100644
--- a/eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py
+++ b/eos/effects/tacticalshieldmanipulationskillboostuniformitybonus.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Tactical Shield Manipulation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.increaseItemAttr("shieldUniformity", skill.getModifiedItemAttr("uniformityBonus") * skill.level)
diff --git a/eos/effects/targetarmorrepair.py b/eos/effects/targetarmorrepair.py
index 8cb72da9db..358ca2c58c 100644
--- a/eos/effects/targetarmorrepair.py
+++ b/eos/effects/targetarmorrepair.py
@@ -3,6 +3,8 @@
 # Used by:
 # Module: QA Remote Armor Repair System - 5 Players
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         bonus = container.getModifiedItemAttr("armorDamageAmount")
diff --git a/eos/effects/targetattack.py b/eos/effects/targetattack.py
index 1562207181..a1330eab71 100644
--- a/eos/effects/targetattack.py
+++ b/eos/effects/targetattack.py
@@ -4,6 +4,8 @@
 # Drones from group: Combat Drone (74 of 74)
 # Modules from group: Energy Weapon (208 of 209)
 type = 'active'
+
+
 def handler(fit, module, context):
     # Set reload time to 1 second
     module.reloadTime = 1000
diff --git a/eos/effects/targetbreaker.py b/eos/effects/targetbreaker.py
index 6fe490afb9..a9369bee53 100644
--- a/eos/effects/targetbreaker.py
+++ b/eos/effects/targetbreaker.py
@@ -3,5 +3,7 @@
 # Used by:
 # Module: Target Spectrum Breaker
 type = "active"
+
+
 def handler(fit, module, context):
     pass
diff --git a/eos/effects/targethostiles.py b/eos/effects/targethostiles.py
index ee3a3714e7..65664fa77d 100644
--- a/eos/effects/targethostiles.py
+++ b/eos/effects/targethostiles.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Automated Targeting System (6 of 6)
 type = "active"
+
+
 def handler(fit, module, context):
     # This effect enables the ACTIVE state for auto targeting systems.
     pass
diff --git a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py
index 3679571b5c..fcf70276e5 100644
--- a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py
+++ b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skills named like: Target Management (2 of 2)
 type = "passive"
+
+
 def handler(fit, skill, context):
     amount = skill.getModifiedItemAttr("maxTargetBonus") * skill.level
     fit.extraAttributes.increase("maxTargetsLockedFromSkills", amount)
diff --git a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
index 00519379a7..abb1ad0d7a 100644
--- a/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
+++ b/eos/effects/thermalshieldcompensationhardeningbonusgroupshieldamp.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Thermal Shield Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "thermalDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "thermalDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py b/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
index 653b75056f..36790f342e 100644
--- a/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
+++ b/eos/effects/thermicarmorcompensationhardeningbonusgrouparmorcoating.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Thermal Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "thermalDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "thermalDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py b/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
index ef27652024..8f33c77d79 100644
--- a/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
+++ b/eos/effects/thermicarmorcompensationhardeningbonusgroupenergized.py
@@ -3,6 +3,9 @@
 # Used by:
 # Skill: Thermal Armor Compensation
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "thermalDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
\ No newline at end of file
+                                  "thermalDamageResistanceBonus",
+                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/thermodynamicsskilldamagebonus.py b/eos/effects/thermodynamicsskilldamagebonus.py
index e92e19bc37..54569b06a6 100644
--- a/eos/effects/thermodynamicsskilldamagebonus.py
+++ b/eos/effects/thermodynamicsskilldamagebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Thermodynamics
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
                                   skill.getModifiedItemAttr("thermodynamicsHeatDamage") * skill.level)
diff --git a/eos/effects/titanamarrgangcaprecharge2.py b/eos/effects/titanamarrgangcaprecharge2.py
index bc72d46062..46a1c15897 100644
--- a/eos/effects/titanamarrgangcaprecharge2.py
+++ b/eos/effects/titanamarrgangcaprecharge2.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "rechargeRate"
 gangBonus = "titanAmarrBonus2"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr(gangBoost, ship.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/titanamarrlaserdmg3.py b/eos/effects/titanamarrlaserdmg3.py
index f265306e37..f98d992960 100644
--- a/eos/effects/titanamarrlaserdmg3.py
+++ b/eos/effects/titanamarrlaserdmg3.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Avatar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
                                   "damageMultiplier", ship.getModifiedItemAttr("titanAmarrBonus3"), skill="Amarr Titan")
diff --git a/eos/effects/titanamarrleadershipmoduleamount4.py b/eos/effects/titanamarrleadershipmoduleamount4.py
index 71fd418113..e87e8e723f 100644
--- a/eos/effects/titanamarrleadershipmoduleamount4.py
+++ b/eos/effects/titanamarrleadershipmoduleamount4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Avatar
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("titanAmarrBonus4"), skill="Amarr Titan")
+                                     "maxGroupActive", ship.getModifiedItemAttr("titanAmarrBonus4"),
+                                     skill="Amarr Titan")
diff --git a/eos/effects/titanamarrskilllevel2.py b/eos/effects/titanamarrskilllevel2.py
index f5c922bedd..0c02a8f247 100644
--- a/eos/effects/titanamarrskilllevel2.py
+++ b/eos/effects/titanamarrskilllevel2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Amarr Titan
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.multiplyItemAttr("titanAmarrBonus2", skill.level)
diff --git a/eos/effects/titancaldarigangshieldhp2.py b/eos/effects/titancaldarigangshieldhp2.py
index a7e7461f38..fa92c0e331 100644
--- a/eos/effects/titancaldarigangshieldhp2.py
+++ b/eos/effects/titancaldarigangshieldhp2.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "shieldCapacity"
 gangBonus = "shipBonusCT2"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr(gangBoost, ship.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/titancaldarileadershipmoduleamount4.py b/eos/effects/titancaldarileadershipmoduleamount4.py
index 73df23284b..0ee8df552d 100644
--- a/eos/effects/titancaldarileadershipmoduleamount4.py
+++ b/eos/effects/titancaldarileadershipmoduleamount4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("titanCaldariBonus4"), skill="Caldari Titan")
+                                     "maxGroupActive", ship.getModifiedItemAttr("titanCaldariBonus4"),
+                                     skill="Caldari Titan")
diff --git a/eos/effects/titancaldarimissilekineticdmg2.py b/eos/effects/titancaldarimissilekineticdmg2.py
index af9079da10..8e26a17a02 100644
--- a/eos/effects/titancaldarimissilekineticdmg2.py
+++ b/eos/effects/titancaldarimissilekineticdmg2.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Leviathan
 type = "passive"
+
+
 def handler(fit, ship, context):
     groups = ("XL Torpedo", "XL Cruise Missile")
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
diff --git a/eos/effects/titancaldariskilllevel2.py b/eos/effects/titancaldariskilllevel2.py
index 886a909e32..314d08a1aa 100644
--- a/eos/effects/titancaldariskilllevel2.py
+++ b/eos/effects/titancaldariskilllevel2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Caldari Titan
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.multiplyItemAttr("shipBonusCT2", skill.level)
diff --git a/eos/effects/titangallentegangarmorhp2.py b/eos/effects/titangallentegangarmorhp2.py
index 349f6e0f0d..eb83564a7b 100644
--- a/eos/effects/titangallentegangarmorhp2.py
+++ b/eos/effects/titangallentegangarmorhp2.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "armorHP"
 gangBonus = "titanGallenteBonus2"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr(gangBoost, ship.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/titangallentehybriddamage1.py b/eos/effects/titangallentehybriddamage1.py
index cb53fe7109..1121491e4d 100644
--- a/eos/effects/titangallentehybriddamage1.py
+++ b/eos/effects/titangallentehybriddamage1.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Erebus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("titanGallenteBonus1"), skill="Gallente Titan")
+                                  "damageMultiplier", ship.getModifiedItemAttr("titanGallenteBonus1"),
+                                  skill="Gallente Titan")
diff --git a/eos/effects/titangallenteleadershipmoduleamount4.py b/eos/effects/titangallenteleadershipmoduleamount4.py
index f78c15661d..c581004696 100644
--- a/eos/effects/titangallenteleadershipmoduleamount4.py
+++ b/eos/effects/titangallenteleadershipmoduleamount4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Erebus
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                  "maxGroupActive", ship.getModifiedItemAttr("titanGallenteBonus4"), skill="Gallente Titan")
+                                     "maxGroupActive", ship.getModifiedItemAttr("titanGallenteBonus4"),
+                                     skill="Gallente Titan")
diff --git a/eos/effects/titangallenteskilllevel2.py b/eos/effects/titangallenteskilllevel2.py
index fc85479569..55fda8b787 100644
--- a/eos/effects/titangallenteskilllevel2.py
+++ b/eos/effects/titangallenteskilllevel2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Gallente Titan
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.multiplyItemAttr("titanGallenteBonus2", skill.level)
diff --git a/eos/effects/titanminmatargangsigradius2.py b/eos/effects/titanminmatargangsigradius2.py
index 8055263d50..014642dd3e 100644
--- a/eos/effects/titanminmatargangsigradius2.py
+++ b/eos/effects/titanminmatargangsigradius2.py
@@ -5,5 +5,7 @@
 type = "gang"
 gangBoost = "signatureRadius"
 gangBonus = "titanMinmatarBonus2"
+
+
 def handler(fit, ship, context):
     fit.ship.boostItemAttr(gangBoost, ship.getModifiedItemAttr(gangBonus))
diff --git a/eos/effects/titanminmatarleadershipmoduleamount4.py b/eos/effects/titanminmatarleadershipmoduleamount4.py
index e955fb0607..beae56511a 100644
--- a/eos/effects/titanminmatarleadershipmoduleamount4.py
+++ b/eos/effects/titanminmatarleadershipmoduleamount4.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Ragnarok
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("titanMinmatarBonus4"), skill="Minmatar Titan")
+                                     "maxGroupActive", ship.getModifiedItemAttr("titanMinmatarBonus4"),
+                                     skill="Minmatar Titan")
diff --git a/eos/effects/titanminmatarprojectiledmg3.py b/eos/effects/titanminmatarprojectiledmg3.py
index 568ffd8664..4b07a251b8 100644
--- a/eos/effects/titanminmatarprojectiledmg3.py
+++ b/eos/effects/titanminmatarprojectiledmg3.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Ragnarok
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("titanMinmatarBonus3"), skill="Minmatar Titan")
+                                  "damageMultiplier", ship.getModifiedItemAttr("titanMinmatarBonus3"),
+                                  skill="Minmatar Titan")
diff --git a/eos/effects/titanminmatarskilllevel2.py b/eos/effects/titanminmatarskilllevel2.py
index c6bb3ba6c6..cb6e27a0bd 100644
--- a/eos/effects/titanminmatarskilllevel2.py
+++ b/eos/effects/titanminmatarskilllevel2.py
@@ -3,5 +3,7 @@
 # Used by:
 # Skill: Minmatar Titan
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.ship.multiplyItemAttr("titanMinmatarBonus2", skill.level)
diff --git a/eos/effects/titanturretdamagescaling.py b/eos/effects/titanturretdamagescaling.py
index 7f549ae75e..a8f00c006d 100644
--- a/eos/effects/titanturretdamagescaling.py
+++ b/eos/effects/titanturretdamagescaling.py
@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "turretDamageScalingRadius", ship.getModifiedItemAttr("titanBonusScalingRadius"))
diff --git a/eos/effects/trackingspeedbonuseffecthybrids.py b/eos/effects/trackingspeedbonuseffecthybrids.py
index 97f19b77ec..147d91b3cc 100644
--- a/eos/effects/trackingspeedbonuseffecthybrids.py
+++ b/eos/effects/trackingspeedbonuseffecthybrids.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Hybrid Metastasis Adjuster (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
                                   "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/trackingspeedbonuseffectlasers.py b/eos/effects/trackingspeedbonuseffectlasers.py
index b6f873bc2a..da849e037e 100644
--- a/eos/effects/trackingspeedbonuseffectlasers.py
+++ b/eos/effects/trackingspeedbonuseffectlasers.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Energy Metastasis Adjuster (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
                                   "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/trackingspeedbonuseffectprojectiles.py b/eos/effects/trackingspeedbonuseffectprojectiles.py
index d29c104d8e..ed2c4d3231 100644
--- a/eos/effects/trackingspeedbonuseffectprojectiles.py
+++ b/eos/effects/trackingspeedbonuseffectprojectiles.py
@@ -3,7 +3,9 @@
 # Used by:
 # Modules named like: Projectile Metastasis Adjuster (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
                                   "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)
diff --git a/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py b/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py
index d5c94a0644..6e1df7bcf7 100644
--- a/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py
+++ b/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py
@@ -7,6 +7,8 @@
 # Implant: Ogdin's Eye Coordination Enhancer
 # Skill: Motion Prediction
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/tractorbeamcan.py b/eos/effects/tractorbeamcan.py
index 72d9b451e6..293a839ea7 100644
--- a/eos/effects/tractorbeamcan.py
+++ b/eos/effects/tractorbeamcan.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Tractor Beam (4 of 4)
 type = "active"
+
+
 def handler(fit, module, context):
-    pass
\ No newline at end of file
+    pass
diff --git a/eos/effects/triagemodeeffect3.py b/eos/effects/triagemodeeffect3.py
index 17b9a8758c..da9b55cbe3 100644
--- a/eos/effects/triagemodeeffect3.py
+++ b/eos/effects/triagemodeeffect3.py
@@ -4,6 +4,8 @@
 # Module: Triage Module I
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
     # Remote armor reps
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
diff --git a/eos/effects/triagemodeeffect7.py b/eos/effects/triagemodeeffect7.py
index 17cb9532fb..8a85f181f6 100644
--- a/eos/effects/triagemodeeffect7.py
+++ b/eos/effects/triagemodeeffect7.py
@@ -4,6 +4,8 @@
 # Module: Triage Module II
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
     # Remote armor reps
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
diff --git a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
index 63d9743b90..12d535bb26 100644
--- a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
+++ b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py
@@ -1,13 +1,15 @@
 # Not used by any item
 type = "projected", "active"
+
+
 def handler(fit, container, context):
     if "projected" in context:
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                          "trackingSpeed", container.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                         stackingPenalties = True, penaltyGroup="postMul")
+                                         stackingPenalties=True, penaltyGroup="postMul")
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                          "maxRange", container.getModifiedItemAttr("maxRangeMultiplier"),
-                                         stackingPenalties = True, penaltyGroup="postMul")
+                                         stackingPenalties=True, penaltyGroup="postMul")
         fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
                                          "falloff", container.getModifiedItemAttr("fallofMultiplier"),
-                                         stackingPenalties = True, penaltyGroup="postMul")
+                                         stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py
index f21a7b778c..f212d2e5ed 100644
--- a/eos/effects/usemissiles.py
+++ b/eos/effects/usemissiles.py
@@ -5,6 +5,8 @@
 # Modules from group: Missile Launcher Rocket (15 of 15)
 # Modules named like: Launcher (151 of 151)
 type = 'active'
+
+
 def handler(fit, module, context):
     # Set reload time to 10 seconds
     module.reloadTime = 10000
diff --git a/eos/effects/velocitybonusonline.py b/eos/effects/velocitybonusonline.py
index aa96ff6e4e..5ffd1b9bba 100644
--- a/eos/effects/velocitybonusonline.py
+++ b/eos/effects/velocitybonusonline.py
@@ -5,6 +5,8 @@
 # Modules from group: Nanofiber Internal Structure (7 of 7)
 # Modules from group: Overdrive Injector System (7 of 7)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),
-                           stackingPenalties = True)
\ No newline at end of file
+                           stackingPenalties=True)
diff --git a/eos/effects/velocitybonuspassive.py b/eos/effects/velocitybonuspassive.py
index 20b800105e..3d0b1c6d1e 100644
--- a/eos/effects/velocitybonuspassive.py
+++ b/eos/effects/velocitybonuspassive.py
@@ -3,6 +3,8 @@
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),
-                           stackingPenalties = True)
\ No newline at end of file
+                           stackingPenalties=True)
diff --git a/eos/effects/warfarelinkcpuaddition.py b/eos/effects/warfarelinkcpuaddition.py
index e0f079e6cd..df5ec151c1 100644
--- a/eos/effects/warfarelinkcpuaddition.py
+++ b/eos/effects/warfarelinkcpuaddition.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Gang Coordinator (30 of 31)
 type = "passive"
+
+
 def handler(fit, module, context):
     module.increaseItemAttr("cpu", module.getModifiedItemAttr("warfareLinkCPUAdd") or 0)
diff --git a/eos/effects/warfarelinkcpupenalty.py b/eos/effects/warfarelinkcpupenalty.py
index 2d19ff90ac..c0f3c66299 100644
--- a/eos/effects/warfarelinkcpupenalty.py
+++ b/eos/effects/warfarelinkcpupenalty.py
@@ -3,7 +3,8 @@
 # Used by:
 # Subsystems from group: Defensive Systems (12 of 16)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"),
                                      "warfareLinkCPUAdd", module.getModifiedItemAttr("warfareLinkCPUPenalty"))
-
diff --git a/eos/effects/warpdisruptsphere.py b/eos/effects/warpdisruptsphere.py
index 7a1751eca8..3fe88bd131 100644
--- a/eos/effects/warpdisruptsphere.py
+++ b/eos/effects/warpdisruptsphere.py
@@ -4,6 +4,8 @@
 # Modules from group: Warp Disrupt Field Generator (7 of 7)
 type = "active"
 runTime = "early"
+
+
 def handler(fit, module, context):
     fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"))
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py
index 749572a322..8e8bd9cec3 100644
--- a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py
+++ b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py
@@ -3,5 +3,7 @@
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Warp Drive Operation WD (6 of 6)
 type = "passive"
+
+
 def handler(fit, implant, context):
     fit.ship.boostItemAttr("warpCapacitorNeed", implant.getModifiedItemAttr("warpCapacitorNeedBonus"))
diff --git a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py
index e5f4431a68..f47c472649 100644
--- a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py
+++ b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationshipgrouppropulsion.py
@@ -4,7 +4,9 @@
 # Modules named like: Warp Core Optimizer (8 of 8)
 # Skill: Warp Drive Operation
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.ship.boostItemAttr("warpCapacitorNeed", container.getModifiedItemAttr("warpCapacitorNeedBonus") * level,
-                           stackingPenalties = "skill" not in context)
+                           stackingPenalties="skill" not in context)
diff --git a/eos/effects/warpscramble.py b/eos/effects/warpscramble.py
index 96d0b3d402..7aa1940996 100644
--- a/eos/effects/warpscramble.py
+++ b/eos/effects/warpscramble.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules named like: Warp Disruptor (27 of 27)
 type = "projected", "active"
+
+
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
\ No newline at end of file
+    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index 5369efc45d..c220fb4fd1 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -2,10 +2,12 @@
 #
 # Used by:
 # Modules named like: Warp Scrambler (26 of 26)
+
+from eos.types import State
+
 runTime = "early"
 type = "projected", "active"
 
-from eos.types import State
 
 def handler(fit, module, context):
     if "projected" not in context:
diff --git a/eos/effects/warpskillspeed.py b/eos/effects/warpskillspeed.py
index adbbf3595f..57174c39db 100644
--- a/eos/effects/warpskillspeed.py
+++ b/eos/effects/warpskillspeed.py
@@ -5,6 +5,8 @@
 # Implants named like: grade Ascendancy (10 of 12)
 # Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
 type = "passive"
+
+
 def handler(fit, container, context):
     penalized = False if "skill" in context or "implant" in context else True
     fit.ship.boostItemAttr("baseWarpSpeed", container.getModifiedItemAttr("WarpSBonus"),
diff --git a/eos/effects/warpspeedaddition.py b/eos/effects/warpspeedaddition.py
index ede5150d8f..1350c3a85b 100644
--- a/eos/effects/warpspeedaddition.py
+++ b/eos/effects/warpspeedaddition.py
@@ -3,5 +3,7 @@
 # Used by:
 # Modules from group: Warp Accelerator (3 of 3)
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("warpSpeedAdd"))
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py
index 95cb52d4b6..72f944de7b 100644
--- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py
+++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringbomblauncher.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
\ No newline at end of file
+                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py
index 3801d33166..9fcfb86fe3 100644
--- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py
+++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergypulseweapons.py
@@ -3,6 +3,8 @@
 # Used by:
 # Skill: Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
\ No newline at end of file
+                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py
index 0ee1fa044e..13126e2a57 100644
--- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gnome' Weapon Upgrades WU (6 of 6)
 # Skill: Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py
index 0571e19414..d64e199440 100644
--- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py
+++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py
@@ -4,6 +4,8 @@
 # Implants named like: Zainou 'Gnome' Launcher CPU Efficiency LE (6 of 6)
 # Skill: Weapon Upgrades
 type = "passive"
+
+
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
diff --git a/eos/effects/zcolinorcacargobonus.py b/eos/effects/zcolinorcacargobonus.py
index ba78fadec0..f513bb0ee5 100644
--- a/eos/effects/zcolinorcacargobonus.py
+++ b/eos/effects/zcolinorcacargobonus.py
@@ -3,5 +3,8 @@
 # Used by:
 # Ship: Orca
 type = "passive"
+
+
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipOrcaCargoBonusOrca1"), skill="Industrial Command Ships")
+    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipOrcaCargoBonusOrca1"),
+                           skill="Industrial Command Ships")
diff --git a/eos/effects/zcolinorcaforemanmodbonus.py b/eos/effects/zcolinorcaforemanmodbonus.py
index 9c536a9a02..28db599f65 100644
--- a/eos/effects/zcolinorcaforemanmodbonus.py
+++ b/eos/effects/zcolinorcaforemanmodbonus.py
@@ -3,6 +3,9 @@
 # Used by:
 # Ship: Orca
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
-                                  "commandBonus", ship.getModifiedItemAttr("shipOrcaForemanBonus"), skill="Industrial Command Ships")
+                                  "commandBonus", ship.getModifiedItemAttr("shipOrcaForemanBonus"),
+                                  skill="Industrial Command Ships")
diff --git a/eos/effects/zcolinorcasurveyscannerbonus.py b/eos/effects/zcolinorcasurveyscannerbonus.py
index 7e73bc9dcb..1018bedab2 100644
--- a/eos/effects/zcolinorcasurveyscannerbonus.py
+++ b/eos/effects/zcolinorcasurveyscannerbonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Orca
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",
                                   "surveyScanRange", ship.getModifiedItemAttr("shipOrcaSurveyScannerBonus"))
diff --git a/eos/effects/zcolinorcatractorrangebonus.py b/eos/effects/zcolinorcatractorrangebonus.py
index 6d26a56b3e..c568b62894 100644
--- a/eos/effects/zcolinorcatractorrangebonus.py
+++ b/eos/effects/zcolinorcatractorrangebonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Orca
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
                                   "maxRange", ship.getModifiedItemAttr("shipOrcaTractorBeamRangeBonus1"))
diff --git a/eos/effects/zcolinorcatractorvelocitybonus.py b/eos/effects/zcolinorcatractorvelocitybonus.py
index 74f39e89bc..c5675aad00 100644
--- a/eos/effects/zcolinorcatractorvelocitybonus.py
+++ b/eos/effects/zcolinorcatractorvelocitybonus.py
@@ -3,6 +3,8 @@
 # Used by:
 # Ship: Orca
 type = "passive"
+
+
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
                                   "maxTractorVelocity", ship.getModifiedItemAttr("shipOrcaTractorBeamVelocityBonus2"))
diff --git a/eos/enum.py b/eos/enum.py
index e105d014c5..e9fb20a0be 100644
--- a/eos/enum.py
+++ b/eos/enum.py
@@ -1,4 +1,7 @@
 class Enum():
+    def __init__(self):
+        pass
+
     @classmethod
     def getTypes(cls):
         for stuff in cls.__dict__:
diff --git a/eos/eqBase.py b/eos/eqBase.py
index 0724366424..a400aec33b 100644
--- a/eos/eqBase.py
+++ b/eos/eqBase.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,7 +15,8 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
+
 
 class EqBase(object):
     def __eq__(self, other):
@@ -25,4 +26,4 @@ def __ne__(self, other):
         return type(self) != type(other) or self.ID != other.ID
 
     def __hash__(self):
-        return id(type(self)) + self.ID
\ No newline at end of file
+        return id(type(self)) + self.ID
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 5f3f62bb38..febc59ac8e 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,24 +15,24 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import re
+import traceback
 
 from sqlalchemy.orm import reconstructor
 
-from eqBase import EqBase
-
-import traceback
 import eos.db
+from eqBase import EqBase
 
 try:
     from collections import OrderedDict
 except ImportError:
     from utils.compat import OrderedDict
 
+
 class Effect(EqBase):
-    '''
+    """
     The effect handling class, it is used to proxy and load effect handler code,
     as well as a container for extra information regarding effects coming
     from the gamedata db.
@@ -41,26 +41,26 @@ class Effect(EqBase):
     @ivar name: The name of this effect
     @ivar description: The description of this effect, this is usualy pretty useless
     @ivar published: Wether this effect is published or not, unpublished effects are typicaly unused.
-    '''
-    #Filter to change names of effects to valid python method names
+    """
+    # Filter to change names of effects to valid python method names
     nameFilter = re.compile("[^A-Za-z0-9]")
 
     @reconstructor
     def init(self):
-        '''
+        """
         Reconstructor, composes the object as we grab it from the database
-        '''
+        """
         self.__generated = False
         self.__effectModule = None
         self.handlerName = re.sub(self.nameFilter, "", self.name).lower()
 
     @property
     def handler(self):
-        '''
+        """
         The handler for the effect,
         It is automaticly fetched from effects/<effectName>.py if the file exists
         the first time this property is accessed.
-        '''
+        """
         if not self.__generated:
             self.__generateHandler()
 
@@ -68,7 +68,7 @@ def handler(self):
 
     @property
     def runTime(self):
-        '''
+        """
         The runTime that this effect should be run at.
         This property is also automaticly fetched from effects/<effectName>.py if the file exists.
         the possible values are:
@@ -77,7 +77,7 @@ def runTime(self):
 
         effects with an early runTime will be ran first when things are calculated,
         followed by effects with a normal runTime and as last effects with a late runTime are ran.
-        '''
+        """
         if not self.__generated:
             self.__generateHandler()
 
@@ -85,7 +85,7 @@ def runTime(self):
 
     @property
     def type(self):
-        '''
+        """
         The type of the effect, automaticly fetched from effects/<effectName>.py if the file exists.
 
         Valid values are:
@@ -95,7 +95,7 @@ def type(self):
         the effect is. passive vs active gives eos clues about wether to module
         is activatable or not (duh!) and projected and gang each tell eos that the
         module can be projected onto other fits, or used as a gang booster module respectivly
-        '''
+        """
         if not self.__generated:
             self.__generateHandler()
 
@@ -103,23 +103,23 @@ def type(self):
 
     @property
     def isImplemented(self):
-        '''
+        """
         Wether this effect is implemented in code or not,
         unimplemented effects simply do nothing at all when run
-        '''
+        """
         return self.handler != effectDummy
 
     def isType(self, type):
-        '''
+        """
         Check if this effect is of the passed type
-        '''
+        """
         return self.type is not None and type in self.type
 
     def __generateHandler(self):
-        '''
+        """
         Grab the handler, type and runTime from the effect code if it exists,
         if it doesn't, set dummy values and add a dummy handler
-        '''
+        """
         try:
             self.__effectModule = effectModule = __import__('eos.effects.' + self.handlerName, fromlist=True)
             try:
@@ -159,10 +159,11 @@ def getattr(self, key):
 def effectDummy(*args, **kwargs):
     pass
 
+
 class Item(EqBase):
-    MOVE_ATTRS = (4,   # Mass
+    MOVE_ATTRS = (4,  # Mass
                   38,  # Capacity
-                  161) # Volume
+                  161)  # Volume
 
     MOVE_ATTR_INFO = None
 
@@ -301,14 +302,14 @@ def race(self):
                 map = {1: "caldari",
                        2: "minmatar",
                        4: "amarr",
-                       5: "sansha", # Caldari + Amarr
-                       6: "blood", # Minmatar + Amarr
+                       5: "sansha",  # Caldari + Amarr
+                       6: "blood",  # Minmatar + Amarr
                        8: "gallente",
-                       9: "guristas", # Caldari + Gallente
-                       10: "angelserp", # Minmatar + Gallente, final race depends on the order of skills
-                       12: "sisters", # Amarr + Gallente
+                       9: "guristas",  # Caldari + Gallente
+                       10: "angelserp",  # Minmatar + Gallente, final race depends on the order of skills
+                       12: "sisters",  # Amarr + Gallente
                        16: "jove",
-                       32: "sansha", # Incrusion Sansha
+                       32: "sansha",  # Incrusion Sansha
                        128: "ore"}
                 # Race is None by default
                 race = None
@@ -329,7 +330,6 @@ def race(self):
                 self.__race = race
         return self.__race
 
-
     @property
     def assistive(self):
         """Detects if item can be used as assistance"""
@@ -387,38 +387,49 @@ def __repr__(self):
 class MetaData(EqBase):
     pass
 
+
 class EffectInfo(EqBase):
     pass
 
+
 class AttributeInfo(EqBase):
     pass
 
+
 class Attribute(EqBase):
     pass
 
+
 class Category(EqBase):
     pass
 
+
 class Group(EqBase):
     pass
 
+
 class Icon(EqBase):
     pass
 
+
 class MarketGroup(EqBase):
     def __repr__(self):
         return u"MarketGroup(ID={}, name={}, parent={}) at {}".format(
             self.ID, self.name, getattr(self.parent, "name", None), self.name, hex(id(self))
         ).encode('utf8')
 
+
 class MetaGroup(EqBase):
     pass
 
+
 class MetaType(EqBase):
     pass
 
+
 class Unit(EqBase):
     pass
 
+
 class Traits(EqBase):
     pass
diff --git a/eos/graph/__init__.py b/eos/graph/__init__.py
index d4f2d2b3b4..882ac35d1b 100644
--- a/eos/graph/__init__.py
+++ b/eos/graph/__init__.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,12 +15,13 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import itertools
 
+
 class Graph(object):
-    def __init__(self, fit, function, data = None):
+    def __init__(self, fit, function, data=None):
         self.fit = fit
         self.data = {}
         if data is not None:
@@ -39,8 +40,8 @@ def getIterator(self):
         pointNames = []
         pointIterators = []
         for data in self.data.itervalues():
-                pointNames.append(data.name)
-                pointIterators.append(data)
+            pointNames.append(data.name)
+            pointIterators.append(data)
 
         return self._iterator(pointNames, pointIterators)
 
@@ -66,7 +67,7 @@ def parseString(self, dataString):
         dataList = []
         for data in dataString.split(";"):
             if isinstance(data, basestring) and "-" in data:
-                #Dealing with a range
+                # Dealing with a range
                 dataList.append(Range(data, self.step))
             else:
                 dataList.append(Constant(data))
@@ -95,6 +96,7 @@ def __iter__(self):
     def isConstant(self):
         return True
 
+
 class Range(object):
     def __init__(self, string, step):
         start, end = string.split("-")
diff --git a/eos/graph/fitDps.py b/eos/graph/fitDps.py
index 7bdc68ca00..cfc9ec5f42 100644
--- a/eos/graph/fitDps.py
+++ b/eos/graph/fitDps.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,12 +15,14 @@
 #
 # 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.graph import Graph, Data
-from eos.types import Hardpoint, State
 from math import log, sin, radians, exp
 
+from eos.graph import Graph
+from eos.types import Hardpoint, State
+
+
 class FitDpsGraph(Graph):
     defaults = {"angle": 0,
                 "distance": 0,
@@ -32,7 +34,7 @@ def __init__(self, fit, data=None):
         self.fit = fit
 
     def calcDps(self, data):
-        ew = {'signatureRadius':[],'velocity':[]}
+        ew = {'signatureRadius': [], 'velocity': []}
         fit = self.fit
         total = 0
         distance = data["distance"] * 1000
@@ -41,13 +43,17 @@ def calcDps(self, data):
         for mod in fit.modules:
             if not mod.isEmpty and mod.state >= State.ACTIVE:
                 if "remoteTargetPaintFalloff" in mod.item.effects:
-                    ew['signatureRadius'].append(1+(mod.getModifiedItemAttr("signatureRadiusBonus") / 100) * self.calculateModuleMultiplier(mod, data))
+                    ew['signatureRadius'].append(
+                        1 + (mod.getModifiedItemAttr("signatureRadiusBonus") / 100) * self.calculateModuleMultiplier(
+                            mod, data))
                 if "remoteWebifierFalloff" in mod.item.effects:
                     if distance <= mod.getModifiedItemAttr("maxRange"):
-                        ew['velocity'].append(1+(mod.getModifiedItemAttr("speedFactor") / 100))
+                        ew['velocity'].append(1 + (mod.getModifiedItemAttr("speedFactor") / 100))
                     elif mod.getModifiedItemAttr("falloffEffectiveness") > 0:
-                        #I am affected by falloff
-                        ew['velocity'].append(1+(mod.getModifiedItemAttr("speedFactor") / 100) * self.calculateModuleMultiplier(mod, data))
+                        # I am affected by falloff
+                        ew['velocity'].append(
+                            1 + (mod.getModifiedItemAttr("speedFactor") / 100) * self.calculateModuleMultiplier(mod,
+                                                                                                                data))
 
         ew['signatureRadius'].sort(key=abssort)
         ew['velocity'].sort(key=abssort)
@@ -63,7 +69,7 @@ def calcDps(self, data):
                 pass
 
         for mod in fit.modules:
-            dps, _ =  mod.damageStats(fit.targetResists)
+            dps, _ = mod.damageStats(fit.targetResists)
             if mod.hardpoint == Hardpoint.TURRET:
                 if mod.state >= State.ACTIVE:
                     total += dps * self.calculateTurretMultiplier(mod, data)
@@ -74,8 +80,9 @@ def calcDps(self, data):
 
         if distance <= fit.extraAttributes["droneControlRange"]:
             for drone in fit.drones:
-                multiplier = 1 if drone.getModifiedItemAttr("maxVelocity") > 1 else self.calculateTurretMultiplier(drone, data)
-                dps, _ =  drone.damageStats(fit.targetResists)
+                multiplier = 1 if drone.getModifiedItemAttr("maxVelocity") > 1 else self.calculateTurretMultiplier(
+                    drone, data)
+                dps, _ = drone.damageStats(fit.targetResists)
                 total += dps * multiplier
 
         # this is janky as fuck
@@ -98,20 +105,21 @@ def calculateMissileMultiplier(self, mod, data):
 
         sigRadiusFactor = targetSigRad / explosionRadius
         if targetVelocity:
-            velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** damageReductionFactor
+            velocityFactor = (
+                             explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** damageReductionFactor
         else:
             velocityFactor = 1
 
         return min(sigRadiusFactor, velocityFactor, 1)
 
     def calculateTurretMultiplier(self, mod, data):
-        #Source for most of turret calculation info: http://wiki.eveonline.com/en/wiki/Falloff
+        # Source for most of turret calculation info: http://wiki.eveonline.com/en/wiki/Falloff
         chanceToHit = self.calculateTurretChanceToHit(mod, data)
         if chanceToHit > 0.01:
-            #AvgDPS = Base Damage * [ ( ChanceToHit^2 + ChanceToHit + 0.0499 ) / 2 ]
+            # AvgDPS = Base Damage * [ ( ChanceToHit^2 + ChanceToHit + 0.0499 ) / 2 ]
             multiplier = (chanceToHit ** 2 + chanceToHit + 0.0499) / 2
         else:
-            #All hits are wreckings
+            # All hits are wreckings
             multiplier = chanceToHit * 3
         dmgScaling = mod.getModifiedItemAttr("turretDamageScalingRadius")
         if dmgScaling:
@@ -135,14 +143,15 @@ def calculateFighterMissileMultiplier(self, ability, data):
 
         damageReductionSensitivity = ability.fighter.getModifiedItemAttr("{}ReductionSensitivity".format(prefix))
         if damageReductionSensitivity is None:
-            damageReductionSensitivity = ability.fighter.getModifiedItemAttr("{}DamageReductionSensitivity".format(prefix))
+            damageReductionSensitivity = ability.fighter.getModifiedItemAttr(
+                "{}DamageReductionSensitivity".format(prefix))
 
         targetSigRad = explosionRadius if targetSigRad is None else targetSigRad
         sigRadiusFactor = targetSigRad / explosionRadius
 
         if targetVelocity:
             velocityFactor = (explosionVelocity / explosionRadius * targetSigRad / targetVelocity) ** (
-            log(damageReductionFactor) / log(damageReductionSensitivity))
+                log(damageReductionFactor) / log(damageReductionSensitivity))
         else:
             velocityFactor = 1
 
@@ -164,8 +173,8 @@ def calculateTurretChanceToHit(self, mod, data):
         return 0.5 ** (trackingEq + rangeEq)
 
     def calculateModuleMultiplier(self, mod, data):
-        #Simplified formula, we make some assumptions about the module
-        #This is basically the calculateTurretChanceToHit without tracking values
+        # Simplified formula, we make some assumptions about the module
+        # This is basically the calculateTurretChanceToHit without tracking values
         distance = data["distance"] * 1000
         turretOptimal = mod.maxRange
         turretFalloff = mod.falloff
diff --git a/eos/mathUtils.py b/eos/mathUtils.py
index c56e88cf3a..5de12c60fb 100644
--- a/eos/mathUtils.py
+++ b/eos/mathUtils.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Anton Vorobyov
 #
 # This file is part of eos.
@@ -15,10 +15,11 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import decimal
 
+
 def floorFloat(value):
     """Round float down to integer"""
     # We have to convert float to str to keep compatibility with
diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py
index 0f366af6f4..c0f7782634 100644
--- a/eos/modifiedAttributeDict.py
+++ b/eos/modifiedAttributeDict.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,14 +15,15 @@
 #
 # 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 math import exp
 import collections
+from math import exp
 
 defaultValuesCache = {}
 cappingAttrKeyCache = {}
 
+
 class ItemAttrShortcut(object):
     def getModifiedItemAttr(self, key):
         if key in self.itemModifiedAttributes:
@@ -30,6 +31,7 @@ def getModifiedItemAttr(self, key):
         else:
             return None
 
+
 class ChargeAttrShortcut(object):
     def getModifiedChargeAttr(self, key):
         if key in self.chargeModifiedAttributes:
@@ -37,12 +39,13 @@ def getModifiedChargeAttr(self, key):
         else:
             return None
 
-class ModifiedAttributeDict(collections.MutableMapping):
 
+class ModifiedAttributeDict(collections.MutableMapping):
     OVERRIDES = False
 
     class CalculationPlaceholder():
-        pass
+        def __init__(self):
+            pass
 
     def __init__(self, fit=None, parent=None):
         self.parent = parent
@@ -129,7 +132,8 @@ def __iter__(self):
         return (key for key in all)
 
     def __contains__(self, key):
-        return (self.__original is not None and key in self.__original) or key in self.__modified or key in self.__intermediary
+        return (
+               self.__original is not None and key in self.__original) or key in self.__modified or key in self.__intermediary
 
     def __placehold(self, key):
         """Create calculation placeholder in item's modified attribute dict"""
@@ -196,7 +200,8 @@ def __calculateValue(self, key):
             else:
                 dv = attrInfo.defaultValue
                 default = defaultValuesCache[key] = dv if dv is not None else 0.0
-        val = self.__intermediary[key] if key in self.__intermediary else self.__preAssigns[key] if key in self.__preAssigns else self.getOriginal(key) if key in self.__original else default
+        val = self.__intermediary[key] if key in self.__intermediary else self.__preAssigns[
+            key] if key in self.__preAssigns else self.getOriginal(key) if key in self.__original else default
 
         # We'll do stuff in the following order:
         # preIncrease > multiplier > stacking penalized multipliers > postIncrease
@@ -295,7 +300,7 @@ def increase(self, attributeName, increase, position="pre", skill=None):
             tbl = self.__postIncreases
         else:
             raise ValueError("position should be either pre or post")
-        if not attributeName in tbl:
+        if attributeName not in tbl:
             tbl[attributeName] = 0
         tbl[attributeName] += increase
         self.__placehold(attributeName)
@@ -312,15 +317,15 @@ def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGr
         # If we're asked to do stacking penalized multiplication, append values
         # to per penalty group lists
         if stackingPenalties:
-            if not attributeName in self.__penalizedMultipliers:
+            if attributeName not in self.__penalizedMultipliers:
                 self.__penalizedMultipliers[attributeName] = {}
-            if not penaltyGroup in self.__penalizedMultipliers[attributeName]:
+            if penaltyGroup not in self.__penalizedMultipliers[attributeName]:
                 self.__penalizedMultipliers[attributeName][penaltyGroup] = []
             tbl = self.__penalizedMultipliers[attributeName][penaltyGroup]
             tbl.append(multiplier)
         # Non-penalized multiplication factors go to the single list
         else:
-            if not attributeName in self.__multipliers:
+            if attributeName not in self.__multipliers:
                 self.__multipliers[attributeName] = 1
             self.__multipliers[attributeName] *= multiplier
 
@@ -353,6 +358,7 @@ def force(self, attributeName, value):
         self.__placehold(attributeName)
         self.__afflict(attributeName, u"\u2263", value)
 
+
 class Affliction():
     def __init__(self, type, amount):
         self.type = type
diff --git a/eos/saveddata/booster.py b/eos/saveddata/booster.py
index 9d0e98ae06..0a46d662c9 100644
--- a/eos/saveddata/booster.py
+++ b/eos/saveddata/booster.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,16 +15,19 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
-from eos.effectHandlerHelpers import HandledItem
 from sqlalchemy.orm import reconstructor, validates
+
 import eos.db
-import logging
+from eos.effectHandlerHelpers import HandledItem
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
 logger = logging.getLogger(__name__)
 
+
 class Booster(HandledItem, ItemAttrShortcut):
     def __init__(self, item):
         self.__item = item
@@ -95,7 +98,7 @@ def item(self):
         return self.__item
 
     def __calculateSlot(self, item):
-        if not "boosterness" in item.attributes:
+        if "boosterness" not in item.attributes:
             raise ValueError("Passed item is not a booster")
 
         return int(item.attributes["boosterness"].value)
@@ -103,9 +106,11 @@ def __calculateSlot(self, item):
     def clear(self):
         self.itemModifiedAttributes.clear()
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
-        if forceProjected: return
-        if self.active == False: return
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
+        if forceProjected:
+            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",))
@@ -117,13 +122,15 @@ def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
     @validates("ID", "itemID", "ammoID", "active")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "itemID" : lambda val: isinstance(val, int),
-               "ammoID" : lambda val: isinstance(val, int),
-               "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)
-        else: return val
+               "itemID": lambda val: isinstance(val, int),
+               "ammoID": lambda val: isinstance(val, int),
+               "active": lambda val: isinstance(val, bool),
+               "slot": lambda val: isinstance(val, int) and 1 <= val <= 3}
+
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def __deepcopy__(self, memo):
         copy = Booster(self.item)
diff --git a/eos/saveddata/cargo.py b/eos/saveddata/cargo.py
index 676b7cebf7..34ab42db36 100644
--- a/eos/saveddata/cargo.py
+++ b/eos/saveddata/cargo.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,18 +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/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
-from eos.effectHandlerHelpers import HandledItem, HandledCharge
 from sqlalchemy.orm import validates, reconstructor
+
 import eos.db
-import logging
+from eos.effectHandlerHelpers import HandledItem
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
 logger = logging.getLogger(__name__)
 
-class Cargo(HandledItem, ItemAttrShortcut):
 
+class Cargo(HandledItem, ItemAttrShortcut):
     def __init__(self, item):
         """Initialize cargo from the program"""
         self.__item = item
@@ -69,10 +71,12 @@ def clear(self):
     @validates("fitID", "itemID")
     def validator(self, key, val):
         map = {"fitID": lambda val: isinstance(val, int),
-               "itemID" : 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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def __deepcopy__(self, memo):
         copy = Cargo(self.item)
diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index 1f5832ea21..3cf3e70eb2 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,20 +15,22 @@
 #
 # 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.orm import validates, reconstructor
+import logging
 from itertools import chain
 
-from eos.effectHandlerHelpers import HandledItem, HandledImplantBoosterList
-import eos.db
+from sqlalchemy.orm import validates, reconstructor
+
 import eos
+import eos.db
 import eos.types
-import logging
+from eos.effectHandlerHelpers import HandledItem, HandledImplantBoosterList
 
 logger = logging.getLogger(__name__)
 
+
 class Character(object):
     __itemList = None
     __itemIDMap = None
@@ -211,8 +213,9 @@ def filteredSkillBoost(self, filter, *args, **kwargs):
             if filter(element):
                 element.boostItemAttr(*args, **kwargs)
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
-        if forceProjected: return
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
+        if forceProjected:
+            return
         for skill in self.skills:
             fit.register(skill)
             skill.calculateModifiedAttributes(fit, runTime)
@@ -239,18 +242,21 @@ def __deepcopy__(self, memo):
     @validates("ID", "name", "apiKey", "ownerID")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "name" : lambda val: True,
-               "apiKey" : lambda val: val is None or (isinstance(val, basestring) and len(val) > 0),
-               "ownerID" : lambda val: isinstance(val, int) or val is None}
+               "name": lambda val: True,
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def __repr__(self):
         return "Character(ID={}, name={}) at {}".format(
             self.ID, self.name, hex(id(self))
         )
 
+
 class Skill(HandledItem):
     def __init__(self, item, level=0, ro=False, learned=True):
         self.__item = item if not isinstance(item, int) else None
@@ -295,7 +301,7 @@ def level(self, level):
         if (level < 0 or level > 5) and level is not None:
             raise ValueError(str(level) + " is not a valid value for level")
 
-        if hasattr(self, "_Skill__ro") and self.__ro == True:
+        if hasattr(self, "_Skill__ro") and self.__ro is True:
             raise ReadOnlyException()
 
         self.activeLevel = level
@@ -304,13 +310,12 @@ def level(self, level):
         if self.activeLevel == self.__level and self in self.character.dirtySkills:
             self.character.dirtySkills.remove(self)
 
-
     @property
     def item(self):
         if self.__item is None:
             self.__item = item = Character.getSkillIDMap().get(self.itemID)
             if item is None:
-                #This skill is no longer in the database and thus invalid it, get rid of it.
+                # This skill is no longer in the database and thus invalid it, get rid of it.
                 self.character.removeSkill(self)
 
         return self.__item
@@ -322,7 +327,7 @@ def getModifiedItemAttr(self, key):
             return None
 
     def calculateModifiedAttributes(self, fit, runTime):
-        if self.__suppressed: # or not self.learned - removed for GH issue 101
+        if self.__suppressed:  # or not self.learned - removed for GH issue 101
             return
 
         item = self.item
@@ -330,7 +335,8 @@ def calculateModifiedAttributes(self, fit, runTime):
             return
 
         for effect in item.effects.itervalues():
-            if effect.runTime == runTime and effect.isType("passive") and (not fit.isStructure or effect.isType("structure")):
+            if effect.runTime == runTime and effect.isType("passive") and \
+                    (not fit.isStructure or effect.isType("structure")):
                 try:
                     effect.handler(fit, self, ("skill",))
                 except AttributeError:
@@ -348,14 +354,16 @@ def isSuppressed(self):
 
     @validates("characterID", "skillID", "level")
     def validator(self, key, val):
-        if hasattr(self, "_Skill__ro") and self.__ro == True and key != "characterID":
+        if hasattr(self, "_Skill__ro") and self.__ro is True and key != "characterID":
             raise ReadOnlyException()
 
         map = {"characterID": lambda val: isinstance(val, int),
-               "skillID" : 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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def __deepcopy__(self, memo):
         copy = Skill(self.item, self.level, self.__ro)
@@ -366,5 +374,6 @@ def __repr__(self):
             self.item.ID, self.item.name, hex(id(self))
         )
 
+
 class ReadOnlyException(Exception):
     pass
diff --git a/eos/saveddata/citadel.py b/eos/saveddata/citadel.py
index f4d5fed477..1c3c228849 100644
--- a/eos/saveddata/citadel.py
+++ b/eos/saveddata/citadel.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,22 +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 eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
-from eos.effectHandlerHelpers import HandledItem
-from eos.saveddata.mode import Mode
-import eos.db
-from eos.types import Ship
 import logging
 
+from eos.types import Ship
+
 logger = logging.getLogger(__name__)
 
-class Citadel(Ship):
 
+class Citadel(Ship):
     def validate(self, item):
         if item.category.name != "Structure":
-            raise ValueError('Passed item "%s" (category: (%s)) is not under Structure category'%(item.name, item.category.name))
+            raise ValueError(
+                'Passed item "%s" (category: (%s)) is not under Structure category' % (item.name, item.category.name))
 
     def __deepcopy__(self, memo):
         copy = Citadel(self.item)
diff --git a/eos/saveddata/crestchar.py b/eos/saveddata/crestchar.py
index 9fa78f551d..51a32fe260 100644
--- a/eos/saveddata/crestchar.py
+++ b/eos/saveddata/crestchar.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +15,15 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-import urllib
-from cStringIO import StringIO
+# ===============================================================================
 
 from sqlalchemy.orm import reconstructor
-#from tomorrow import threads
 
 
-class CrestChar(object):
+# from tomorrow import threads
 
+
+class CrestChar(object):
     def __init__(self, id, name, refresh_token=None):
         self.ID = id
         self.name = name
diff --git a/eos/saveddata/damagePattern.py b/eos/saveddata/damagePattern.py
index f9be897464..f10e6b50ba 100644
--- a/eos/saveddata/damagePattern.py
+++ b/eos/saveddata/damagePattern.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,14 +15,15 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import re
 
+
 class DamagePattern(object):
     DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
 
-    def __init__(self, emAmount = 25, thermalAmount = 25, kineticAmount = 25, explosiveAmount = 25):
+    def __init__(self, emAmount=25, thermalAmount=25, kineticAmount=25, explosiveAmount=25):
         self.emAmount = emAmount
         self.thermalAmount = thermalAmount
         self.kineticAmount = kineticAmount
@@ -50,7 +51,7 @@ def effectivify(self, fit, amount, type):
         totalDamage = sum((self.emAmount, self.thermalAmount, self.kineticAmount, self.explosiveAmount))
         specificDivider = 0
         for damageType in self.DAMAGE_TYPES:
-            #Compose an attribute name, then make sure the first letter is NOT capitalized
+            # Compose an attribute name, then make sure the first letter is NOT capitalized
             attrName = "%s%sDamageResonance" % (type, damageType.capitalize())
             attrName = attrName[0].lower() + attrName[1:]
 
@@ -65,6 +66,7 @@ def effectivify(self, fit, amount, type):
                  "therm": "thermal",
                  "kin": "kinetic",
                  "exp": "explosive"}
+
     @classmethod
     def importPatterns(cls, text):
         lines = re.split('[\n\r]+', text)
@@ -74,8 +76,8 @@ def importPatterns(cls, text):
             try:
                 if line.strip()[0] == "#":  # comments
                     continue
-                line = line.split('#',1)[0]  # allows for comments
-                type, data = line.rsplit('=',1)
+                line = line.split('#', 1)[0]  # allows for comments
+                type, data = line.rsplit('=', 1)
                 type, data = type.strip(), data.split(',')
             except:
                 # Data isn't in correct format, continue to next line
@@ -94,7 +96,7 @@ def importPatterns(cls, text):
                 except:
                     continue
 
-            if len(fields) == 4: # Avoid possible blank lines
+            if len(fields) == 4:  # Avoid possible blank lines
                 pattern = DamagePattern(**fields)
                 pattern.name = name.strip()
                 patterns.append(pattern)
@@ -102,9 +104,10 @@ def importPatterns(cls, text):
         return patterns, numPatterns
 
     EXPORT_FORMAT = "DamageProfile = %s,%d,%d,%d,%d\n"
+
     @classmethod
     def exportPatterns(cls, *patterns):
-        out  = "# Exported from pyfa\n#\n"
+        out = "# Exported from pyfa\n#\n"
         out += "# Values are in following format:\n"
         out += "# DamageProfile = [name],[EM amount],[Thermal amount],[Kinetic amount],[Explosive amount]\n\n"
         for dp in patterns:
diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py
index 8033384ab0..f847c1764a 100644
--- a/eos/saveddata/drone.py
+++ b/eos/saveddata/drone.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,16 +15,19 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
-from eos.effectHandlerHelpers import HandledItem, HandledCharge
 from sqlalchemy.orm import validates, reconstructor
+
 import eos.db
-import logging
+from eos.effectHandlerHelpers import HandledItem, HandledCharge
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
 
 logger = logging.getLogger(__name__)
 
+
 class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
     DAMAGE_TYPES = ("em", "kinetic", "explosive", "thermal")
     MINING_ATTRIBUTES = ("miningAmount",)
@@ -116,8 +119,8 @@ def hasAmmo(self):
     def dps(self):
         return self.damageStats()
 
-    def damageStats(self, targetResists = None):
-        if self.__dps == None:
+    def damageStats(self, targetResists=None):
+        if self.__dps is None:
             self.__volley = 0
             self.__dps = 0
             if self.dealsDamage is True and self.amountActive > 0:
@@ -125,12 +128,14 @@ def damageStats(self, targetResists = None):
                     attr = "missileLaunchDuration"
                     getter = self.getModifiedChargeAttr
                 else:
-                    attr =  "speed"
+                    attr = "speed"
                     getter = self.getModifiedItemAttr
 
                 cycleTime = self.getModifiedItemAttr(attr)
 
-                volley = sum(map(lambda d: (getter("%sDamage"%d) or 0) * (1-getattr(targetResists, "%sAmount"%d, 0)), self.DAMAGE_TYPES))
+                volley = sum(
+                    map(lambda d: (getter("%sDamage" % d) or 0) * (1 - getattr(targetResists, "%sAmount" % d, 0)),
+                        self.DAMAGE_TYPES))
                 volley *= self.amountActive
                 volley *= self.getModifiedItemAttr("damageMultiplier") or 1
                 self.__volley = volley
@@ -140,7 +145,7 @@ def damageStats(self, targetResists = None):
 
     @property
     def miningStats(self):
-        if self.__miningyield == None:
+        if self.__miningyield is None:
             if self.mines is True and self.amountActive > 0:
                 attr = "duration"
                 getter = self.getModifiedItemAttr
@@ -160,7 +165,8 @@ def maxRange(self):
                  "ecmBurstRange", "maxRange")
         for attr in attrs:
             maxRange = self.getModifiedItemAttr(attr)
-            if maxRange is not None: return maxRange
+            if maxRange is not None:
+                return maxRange
         if self.charge is not None:
             delay = self.getModifiedChargeAttr("explosionDelay")
             speed = self.getModifiedChargeAttr("maxVelocity")
@@ -175,18 +181,21 @@ def falloff(self):
         attrs = ("falloff", "falloffEffectiveness")
         for attr in attrs:
             falloff = self.getModifiedItemAttr(attr)
-            if falloff is not None: return falloff
+            if falloff is not None:
+                return falloff
 
     @validates("ID", "itemID", "chargeID", "amount", "amountActive")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "itemID" : lambda val: isinstance(val, int),
-               "chargeID" : lambda val: isinstance(val, int),
-               "amount" : lambda val: isinstance(val, int) and val >= 0,
-               "amountActive" : lambda val: isinstance(val, int) and val <= self.amount and val >= 0}
+               "itemID": lambda val: isinstance(val, int),
+               "chargeID": lambda val: isinstance(val, int),
+               "amount": lambda val: isinstance(val, int) and val >= 0,
+               "amountActive": lambda val: isinstance(val, int) and self.amount >= val >= 0}
 
-        if map[key](val) == False: raise ValueError(str(val) + " is not a valid value for " + key)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def clear(self):
         self.__dps = None
@@ -201,7 +210,10 @@ def canBeApplied(self, projectedOnto):
         # Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions
         # (all effects which apply instant modification are exception, generally speaking)
         if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1:
-            offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff"))
+            offensiveNonModifiers = {"energyDestabilizationNew",
+                                     "leech",
+                                     "energyNosferatuFalloff",
+                                     "energyNeutralizerFalloff"}
             if not offensiveNonModifiers.intersection(set(item.effects)):
                 return False
         # If assistive modules are not allowed, do not let to apply these altogether
@@ -210,7 +222,7 @@ def canBeApplied(self, projectedOnto):
         else:
             return True
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
         if self.projected or forceProjected:
             context = "projected", "drone"
             projected = True
@@ -220,8 +232,8 @@ def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
 
         for effect in self.item.effects.itervalues():
             if effect.runTime == runTime and \
-            ((projected == True and effect.isType("projected")) or \
-             projected == False and effect.isType("passive")):
+                    ((projected is True and effect.isType("projected")) or
+                        projected is False and effect.isType("passive")):
                 # See GH issue #765
                 if effect.getattr('grouped'):
                     effect.handler(fit, self, context)
diff --git a/eos/saveddata/fighter.py b/eos/saveddata/fighter.py
index bc96c5f101..29015f5f60 100644
--- a/eos/saveddata/fighter.py
+++ b/eos/saveddata/fighter.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,14 +15,15 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
-from eos.effectHandlerHelpers import HandledItem, HandledCharge, HandledDroneCargoList
 from sqlalchemy.orm import validates, reconstructor
+
 import eos.db
-from eos.enum import Enum
-import logging
+from eos.effectHandlerHelpers import HandledItem, HandledCharge
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
 from eos.types import FighterAbility, Slot
 
 logger = logging.getLogger(__name__)
@@ -155,7 +156,7 @@ def hasAmmo(self):
     def dps(self):
         return self.damageStats()
 
-    def damageStats(self, targetResists = None):
+    def damageStats(self, targetResists=None):
         if self.__dps is None:
             self.__volley = 0
             self.__dps = 0
@@ -164,8 +165,10 @@ def damageStats(self, targetResists = None):
                     dps, volley = ability.damageStats(targetResists)
                     self.__dps += dps
                     self.__volley += volley
-                    
-                # For forward compatability this assumes a fighter can have more than 2 damaging abilities and/or multiple that use charges.
+
+                # For forward compatability this assumes a fighter
+                # can have more than 2 damaging abilities and/or
+                # multiple that use charges.
                 if self.owner.factorReload:
                     activeTimes = []
                     reloadTimes = []
@@ -179,8 +182,8 @@ def damageStats(self, targetResists = None):
                             continue
                         activeTimes.append(ability.numShots * ability.cycleTime)
                         reloadTimes.append(ability.reloadTime)
-                    
-                    if(len(activeTimes) > 0):
+
+                    if len(activeTimes) > 0:
                         shortestActive = sorted(activeTimes)[0]
                         longestReload = sorted(reloadTimes, reverse=True)[0]
                         self.__dps = max(constantDps, self.__dps * shortestActive / (shortestActive + longestReload))
@@ -194,7 +197,8 @@ def maxRange(self):
                  "ecmBurstRange", "maxRange")
         for attr in attrs:
             maxRange = self.getModifiedItemAttr(attr)
-            if maxRange is not None: return maxRange
+            if maxRange is not None:
+                return maxRange
         if self.charge is not None:
             delay = self.getModifiedChargeAttr("explosionDelay")
             speed = self.getModifiedChargeAttr("maxVelocity")
@@ -209,18 +213,21 @@ def falloff(self):
         attrs = ("falloff", "falloffEffectiveness")
         for attr in attrs:
             falloff = self.getModifiedItemAttr(attr)
-            if falloff is not None: return falloff
+            if falloff is not None:
+                return falloff
 
     @validates("ID", "itemID", "chargeID", "amount", "amountActive")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "itemID" : lambda val: isinstance(val, int),
-               "chargeID" : lambda val: isinstance(val, int),
-               "amount" : lambda val: isinstance(val, int) and val >= -1,
+               "itemID": lambda val: isinstance(val, int),
+               "chargeID": lambda val: isinstance(val, int),
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def clear(self):
         self.__dps = None
@@ -236,7 +243,10 @@ def canBeApplied(self, projectedOnto):
         # Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions
         # (all effects which apply instant modification are exception, generally speaking)
         if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1:
-            offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff"))
+            offensiveNonModifiers = {"energyDestabilizationNew",
+                                     "leech",
+                                     "energyNosferatuFalloff",
+                                     "energyNeutralizerFalloff"}
             if not offensiveNonModifiers.intersection(set(item.effects)):
                 return False
         # If assistive modules are not allowed, do not let to apply these altogether
@@ -245,7 +255,7 @@ def canBeApplied(self, projectedOnto):
         else:
             return True
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
         if not self.active:
             return
 
@@ -260,7 +270,7 @@ def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
             if ability.active:
                 effect = ability.effect
                 if effect.runTime == runTime and \
-                ((projected and effect.isType("projected")) or not projected):
+                        ((projected and effect.isType("projected")) or not projected):
                     if ability.grouped:
                         effect.handler(fit, self, context)
                     else:
@@ -280,4 +290,3 @@ def fits(self, fit):
             return False
 
         return True
-
diff --git a/eos/saveddata/fighterAbility.py b/eos/saveddata/fighterAbility.py
index 64b5dee2cf..38a21a27e4 100644
--- a/eos/saveddata/fighterAbility.py
+++ b/eos/saveddata/fighterAbility.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,13 +15,15 @@
 #
 # 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.orm import validates, reconstructor
 import logging
 
+from sqlalchemy.orm import reconstructor
+
 logger = logging.getLogger(__name__)
 
+
 class FighterAbility(object):
     DAMAGE_TYPES = ("em", "kinetic", "explosive", "thermal")
     DAMAGE_TYPES2 = ("EM", "Kin", "Exp", "Therm")
@@ -30,18 +32,17 @@ class FighterAbility(object):
     # with the fighter squadron role
     NUM_SHOTS_MAPPING = {
         1: 0,  # Superiority fighter / Attack
-        2: 12, # Light fighter / Attack
+        2: 12,  # Light fighter / Attack
         4: 6,  # Heavy fighter / Heavy attack
         5: 3,  # Heavy fighter / Long range attack
     }
     # Same as above
     REARM_TIME_MAPPING = {
-        1: 0,     # Superiority fighter / Attack
+        1: 0,  # Superiority fighter / Attack
         2: 4000,  # Light fighter / Attack
         4: 6000,  # Heavy fighter / Heavy attack
-        5: 20000, # Heavy fighter / Long range attack
+        5: 20000,  # Heavy fighter / Long range attack
     }
-    
 
     def __init__(self, effect):
         """Initialize from the program"""
@@ -52,7 +53,7 @@ def __init__(self, effect):
 
     @reconstructor
     def init(self):
-        '''Initialize from the database'''
+        """Initialize from the database"""
         self.__effect = None
 
         if self.effectID:
@@ -94,21 +95,28 @@ def hasCharges(self):
 
     @property
     def reloadTime(self):
-        return self.fighter.getModifiedItemAttr("fighterRefuelingTime") + (self.REARM_TIME_MAPPING[self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0) * self.numShots
+        return self.fighter.getModifiedItemAttr("fighterRefuelingTime") + \
+               (self.REARM_TIME_MAPPING[self.fighter.getModifiedItemAttr(
+                   "fighterSquadronRole")] or 0 if self.hasCharges else 0) * self.numShots
 
     @property
     def numShots(self):
-        return self.NUM_SHOTS_MAPPING[self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0
+        return self.NUM_SHOTS_MAPPING[
+                   self.fighter.getModifiedItemAttr("fighterSquadronRole")] or 0 if self.hasCharges else 0
 
     @property
     def cycleTime(self):
         speed = self.fighter.getModifiedItemAttr("{}Duration".format(self.attrPrefix))
+
+        # Factor in reload
+        '''
         reload = self.reloadTime
 
-        #if self.fighter.owner.factorReload:
-        #    numShots = self.numShots
-        #    # Speed here already takes into consideration reactivation time
-        #    speed = (speed * numShots + reload) / numShots if numShots > 0 else speed
+        if self.fighter.owner.factorReload:
+            numShots = self.numShots
+            # Speed here already takes into consideration reactivation time
+            speed = (speed * numShots + reload) / numShots if numShots > 0 else speed
+        '''
 
         return speed
 
@@ -122,7 +130,7 @@ def damageStats(self, targetResists=None):
                 if self.attrPrefix == "fighterAbilityLaunchBomb":
                     # bomb calcs
                     volley = sum(map(lambda attr: (self.fighter.getModifiedChargeAttr("%sDamage" % attr) or 0) * (
-                    1 - getattr(targetResists, "%sAmount" % attr, 0)), self.DAMAGE_TYPES))
+                        1 - getattr(targetResists, "%sAmount" % attr, 0)), self.DAMAGE_TYPES))
                 else:
                     volley = sum(map(lambda d2, d:
                                      (self.fighter.getModifiedItemAttr(
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index a3000267ff..69b17a2694 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,26 +15,23 @@
 #
 # 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.effectHandlerHelpers import *
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-from sqlalchemy.orm import validates, reconstructor
-from itertools import chain
-from eos import capSim
+import copy
+import time
 from copy import deepcopy
+from itertools import chain
 from math import sqrt, log, asinh
-from eos.types import Drone, Cargo, Ship, Character, State, Slot, Module, Implant, Booster, Skill, Citadel
-from eos.saveddata.module import State, Hardpoint
-from eos.saveddata.mode import Mode
-import eos.db
-import time
-import copy
-from utils.timer import Timer
-from eos.enum import Enum
 
+from sqlalchemy.orm import validates, reconstructor
 
-import logging
+import eos.db
+from eos import capSim
+from eos.effectHandlerHelpers import *
+from eos.enum import Enum
+from eos.saveddata.module import State, Hardpoint
+from eos.types import Ship, Character, Slot, Module, Citadel
+from utils.timer import Timer
 
 logger = logging.getLogger(__name__)
 
@@ -43,10 +40,15 @@
 except ImportError:
     from utils.compat import OrderedDict
 
+
 class ImplantLocation(Enum):
+    def __init__(self):
+        pass
+
     FIT = 0
     CHARACTER = 1
 
+
 class Fit(object):
     """Represents a fitting, with modules, ship, implants, etc."""
 
@@ -65,7 +67,7 @@ def __init__(self, ship=None, name=""):
         self.__cargo = HandledDroneCargoList()
         self.__implants = HandledImplantBoosterList()
         self.__boosters = HandledImplantBoosterList()
-        #self.__projectedFits = {}
+        # self.__projectedFits = {}
         self.__projectedModules = HandledProjectedModList()
         self.__projectedDrones = HandledProjectedDroneList()
         self.__projectedFighters = HandledProjectedDroneList()
@@ -299,7 +301,8 @@ def totalYield(self):
 
     @property
     def maxTargets(self):
-        return min(self.extraAttributes["maxTargetsLockedFromSkills"], self.ship.getModifiedItemAttr("maxLockedTargets"))
+        return min(self.extraAttributes["maxTargetsLockedFromSkills"],
+                   self.ship.getModifiedItemAttr("maxLockedTargets"))
 
     @property
     def maxTargetRange(self):
@@ -326,7 +329,7 @@ def scanType(self):
 
     @property
     def jamChance(self):
-        return (1-self.ecmProjectedStr)*100
+        return (1 - self.ecmProjectedStr) * 100
 
     @property
     def maxSpeed(self):
@@ -361,11 +364,13 @@ def appliedImplants(self):
     @validates("ID", "ownerID", "shipID")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "ownerID" : lambda val: isinstance(val, int) or val is None,
-               "shipID" : lambda val: isinstance(val, int) or val is None}
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def clear(self, projected=False):
         self.__effectiveTank = None
@@ -414,8 +419,8 @@ def clear(self, projected=False):
                 if stuff is not None and stuff != self:
                     stuff.clear(projected=True)
 
-    #Methods to register and get the thing currently affecting the fit,
-    #so we can correctly map "Affected By"
+    # Methods to register and get the thing currently affecting the fit,
+    # so we can correctly map "Affected By"
     def register(self, currModifier, origin=None):
         self.__modifier = currModifier
         self.__origin = origin
@@ -439,7 +444,7 @@ def __calculateGangBoosts(self, runTime):
                 context = ("gang", thing.__class__.__name__.lower())
                 if isinstance(thing, Module):
                     if effect.isType("offline") or (effect.isType("passive") and thing.state >= State.ONLINE) or \
-                    (effect.isType("active") and thing.state >= State.ACTIVE):
+                            (effect.isType("active") and thing.state >= State.ACTIVE):
                         # Run effect, and get proper bonuses applied
                         try:
                             self.register(thing)
@@ -466,6 +471,8 @@ def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyS
             if self == targetFit:
                 copied = self  # original fit
                 shadow = True
+                # Don't inspect this, we genuinely want to reassign self
+                # noinspection PyMethodFirstArgAssignment
                 self = copy.deepcopy(self)
                 self.fleet = copied.fleet
                 logger.debug("Handling self projection - making shadow copy of fit. %r => %r", copied, self)
@@ -478,7 +485,7 @@ def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyS
             logger.debug("Fleet is set, gathering gang boosts")
             self.gangBoosts = self.fleet.recalculateLinear(withBoosters=withBoosters)
 
-            timer.checkpoint("Done calculating gang boosts for %r"%self)
+            timer.checkpoint("Done calculating gang boosts for %r" % self)
         elif self.fleet is None:
             self.gangBoosts = None
 
@@ -529,7 +536,7 @@ def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyS
             r = [(self.mode,), self.projectedDrones, self.projectedFighters, self.projectedModules]
 
             # chain unrestricted and restricted into one iterable
-            c = chain.from_iterable(u+r)
+            c = chain.from_iterable(u + r)
 
             # We calculate gang bonuses first so that projected fits get them
             if self.gangBoosts is not None:
@@ -550,7 +557,7 @@ def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyS
                             targetFit.register(item, origin=self)
                             item.calculateModifiedAttributes(targetFit, runTime, True)
 
-            timer.checkpoint('Done with runtime: %s'%runTime)
+            timer.checkpoint('Done with runtime: %s' % runTime)
 
         # Mark fit as calculated
         self.__calculated = True
@@ -583,7 +590,7 @@ def fill(self):
                     self.modules.append(Module.buildEmpty(slotType))
 
             if amount < 0:
-                #Look for any dummies of that type to remove
+                # Look for any dummies of that type to remove
                 toRemove = []
                 for mod in self.modules:
                     if mod.isEmpty and mod.slot == slotType:
@@ -602,7 +609,7 @@ def unfill(self):
 
     @property
     def modCount(self):
-        x=0
+        x = 0
         for i in xrange(len(self.modules) - 1, -1, -1):
             mod = self.modules[i]
             if not mod.isEmpty:
@@ -725,7 +732,7 @@ def cargoBayUsed(self):
     def activeDrones(self):
         amount = 0
         for d in self.drones:
-            amount +=d.amountActive
+            amount += d.amountActive
 
         return amount
 
@@ -794,7 +801,6 @@ def capRecharge(self):
 
         return self.__capRecharge
 
-
     @property
     def sustainableTank(self):
         if self.__sustainableTank is None:
@@ -805,30 +811,29 @@ def sustainableTank(self):
     def calculateSustainableTank(self, effective=True):
         if self.__sustainableTank is None:
             if self.capStable:
-                sustainable = {}
-                sustainable["armorRepair"] = self.extraAttributes["armorRepair"]
-                sustainable["shieldRepair"] = self.extraAttributes["shieldRepair"]
-                sustainable["hullRepair"] = self.extraAttributes["hullRepair"]
+                sustainable = {"armorRepair": self.extraAttributes["armorRepair"],
+                               "shieldRepair": self.extraAttributes["shieldRepair"],
+                               "hullRepair": self.extraAttributes["hullRepair"]}
             else:
                 sustainable = {}
 
                 repairers = []
-                #Map a repairer type to the attribute it uses
+                # Map a repairer type to the attribute it uses
                 groupAttrMap = {"Armor Repair Unit": "armorDamageAmount",
-                     "Ancillary Armor Repairer": "armorDamageAmount",
-                     "Hull Repair Unit": "structureDamageAmount",
-                     "Shield Booster": "shieldBonus",
-                     "Ancillary Shield Booster": "shieldBonus",
-                     "Remote Armor Repairer": "armorDamageAmount",
-                     "Remote Shield Booster": "shieldBonus"}
-                #Map repairer type to attribute
+                                "Ancillary Armor Repairer": "armorDamageAmount",
+                                "Hull Repair Unit": "structureDamageAmount",
+                                "Shield Booster": "shieldBonus",
+                                "Ancillary Shield Booster": "shieldBonus",
+                                "Remote Armor Repairer": "armorDamageAmount",
+                                "Remote Shield Booster": "shieldBonus"}
+                # Map repairer type to attribute
                 groupStoreMap = {"Armor Repair Unit": "armorRepair",
                                  "Hull Repair Unit": "hullRepair",
                                  "Shield Booster": "shieldRepair",
                                  "Ancillary Shield Booster": "shieldRepair",
                                  "Remote Armor Repairer": "armorRepair",
                                  "Remote Shield Booster": "shieldRepair",
-                                 "Ancillary Armor Repairer": "armorRepair",}
+                                 "Ancillary Armor Repairer": "armorRepair", }
 
                 capUsed = self.capUsed
                 for attr in ("shieldRepair", "armorRepair", "hullRepair"):
@@ -854,23 +859,24 @@ def calculateSustainableTank(self, effective=True):
                                     sustainable[attr] -= amount / (cycleTime / 1000.0)
                                     repairers.append(mod)
 
+                # Sort repairers by efficiency. We want to use the most efficient repairers first
+                repairers.sort(key=lambda mod: mod.getModifiedItemAttr(
+                    groupAttrMap[mod.item.group.name]) / mod.getModifiedItemAttr("capacitorNeed"), reverse=True)
 
-                #Sort repairers by efficiency. We want to use the most efficient repairers first
-                repairers.sort(key=lambda mod: mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name]) / mod.getModifiedItemAttr("capacitorNeed"), reverse = True)
-
-                #Loop through every module until we're above peak recharge
-                #Most efficient first, as we sorted earlier.
-                #calculate how much the repper can rep stability & add to total
+                # Loop through every module until we're above peak recharge
+                # Most efficient first, as we sorted earlier.
+                # calculate how much the repper can rep stability & add to total
                 totalPeakRecharge = self.capRecharge
                 for mod in repairers:
-                    if capUsed > totalPeakRecharge: break
+                    if capUsed > totalPeakRecharge:
+                        break
                     cycleTime = mod.cycleTime
                     capPerSec = mod.capUse
                     if capPerSec is not None and cycleTime is not None:
-                        #Check how much this repper can work
+                        # Check how much this repper can work
                         sustainability = min(1, (totalPeakRecharge - capUsed) / capPerSec)
 
-                        #Add the sustainable amount
+                        # Add the sustainable amount
                         amount = mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name])
                         sustainable[groupStoreMap[mod.item.group.name]] += sustainability * (amount / (cycleTime / 1000.0))
                         capUsed += capPerSec
@@ -880,12 +886,12 @@ def calculateSustainableTank(self, effective=True):
 
         return self.__sustainableTank
 
-    def calculateCapRecharge(self, percent = PEAK_RECHARGE):
+    def calculateCapRecharge(self, percent=PEAK_RECHARGE):
         capacity = self.ship.getModifiedItemAttr("capacitorCapacity")
         rechargeRate = self.ship.getModifiedItemAttr("rechargeRate") / 1000.0
         return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
 
-    def calculateShieldRecharge(self, percent = PEAK_RECHARGE):
+    def calculateShieldRecharge(self, percent=PEAK_RECHARGE):
         capacity = self.ship.getModifiedItemAttr("shieldCapacity")
         rechargeRate = self.ship.getModifiedItemAttr("shieldRechargeRate") / 1000.0
         return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
@@ -893,13 +899,12 @@ def calculateShieldRecharge(self, percent = PEAK_RECHARGE):
     def addDrain(self, src, cycleTime, capNeed, clipSize=0):
         """ Used for both cap drains and cap fills (fills have negative capNeed) """
 
-        rigSize = self.ship.getModifiedItemAttr("rigSize")
         energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
         signatureRadius = self.ship.getModifiedItemAttr("signatureRadius")
 
-        #Signature reduction, uses the bomb formula as per CCP Larrikin
+        # Signature reduction, uses the bomb formula as per CCP Larrikin
         if energyNeutralizerSignatureResolution:
-            capNeed = capNeed*min(1, signatureRadius/energyNeutralizerSignatureResolution)
+            capNeed = capNeed * min(1, signatureRadius / energyNeutralizerSignatureResolution)
 
         resistance = self.ship.getModifiedItemAttr("energyWarfareResistance") or 1 if capNeed > 0 else 1
         self.__extraDrains.append((cycleTime, capNeed * resistance, clipSize))
@@ -930,7 +935,8 @@ def __generateDrain(self):
                         # If this is a turret, don't stagger activations
                         disableStagger = mod.hardpoint == Hardpoint.TURRET
 
-                        drains.append((int(fullCycleTime), mod.getModifiedItemAttr("capacitorNeed") or 0, mod.numShots or 0, disableStagger))
+                        drains.append((int(fullCycleTime), mod.getModifiedItemAttr("capacitorNeed") or 0,
+                                       mod.numShots or 0, disableStagger))
 
         for fullCycleTime, capNeed, clipSize in self.iterDrains():
             # Stagger incoming effects for cap simulation
@@ -984,7 +990,7 @@ def ehp(self):
 
     @property
     def tank(self):
-        hps = {"passiveShield" : self.calculateShieldRecharge()}
+        hps = {"passiveShield": self.calculateShieldRecharge()}
         for type in ("shield", "armor", "hull"):
             hps["%sRepair" % type] = self.extraAttributes["%sRepair" % type]
 
@@ -1014,13 +1020,12 @@ def effectiveSustainableTank(self):
 
         return self.__effectiveSustainableTank
 
-
     def calculateLockTime(self, radius):
         scanRes = self.ship.getModifiedItemAttr("scanResolution")
         if scanRes is not None and scanRes > 0:
             # Yes, this function returns time in seconds, not miliseconds.
             # 40,000 is indeed the correct constant here.
-            return min(40000 / scanRes / asinh(radius)**2, 30*60)
+            return min(40000 / scanRes / asinh(radius) ** 2, 30 * 60)
         else:
             return self.ship.getModifiedItemAttr("scanSpeed") / 1000.0
 
@@ -1073,7 +1078,7 @@ def fits(self):
 
     def __deepcopy__(self, memo):
         copy = Fit()
-        #Character and owner are not copied
+        # Character and owner are not copied
         copy.character = self.__character
         copy.owner = self.owner
         copy.ship = deepcopy(self.ship, memo)
@@ -1081,7 +1086,16 @@ def __deepcopy__(self, memo):
         copy.damagePattern = self.damagePattern
         copy.targetResists = self.targetResists
 
-        toCopy = ("modules", "drones", "fighters", "cargo", "implants", "boosters", "projectedModules", "projectedDrones", "projectedFighters")
+        toCopy = (
+            "modules",
+            "drones",
+            "fighters",
+            "cargo",
+            "implants",
+            "boosters",
+            "projectedModules",
+            "projectedDrones",
+            "projectedFighters")
         for name in toCopy:
             orig = getattr(self, name)
             c = getattr(copy, name)
diff --git a/eos/saveddata/fleet.py b/eos/saveddata/fleet.py
index 12c1e78f1c..6fc1b63300 100644
--- a/eos/saveddata/fleet.py
+++ b/eos/saveddata/fleet.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,41 +15,46 @@
 #
 # 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 copy import deepcopy
 from itertools import chain
+
 from eos.types import Skill, Module, Ship
-from copy import deepcopy
+
 
 class Fleet(object):
     def calculateModifiedAttributes(self):
-        #Make sure ALL fits in the gang have been calculated
+        # Make sure ALL fits in the gang have been calculated
         for c in chain(self.wings, (self.leader,)):
-            if c is not None: c.calculateModifiedAttributes()
+            if c is not None:
+                c.calculateModifiedAttributes()
 
         leader = self.leader
         self.booster = booster = self.booster if self.booster is not None else leader
         self.broken = False
         self.store = store = Store()
         store.set(booster, "fleet")
-        #Go all the way down for each subtree we have.
+        # Go all the way down for each subtree we have.
         for wing in self.wings:
             wing.calculateGangBonusses(store)
 
         # Check skill requirements and wing amount to see if we break or not
-        if len(self.wings) == 0 or leader is None or leader.character is None or leader.character.getSkill("Fleet Command").level < len(self.wings):
+        if len(self.wings) == 0 or leader is None or leader.character is None or leader.character.getSkill(
+                "Fleet Command").level < len(self.wings):
             self.broken = True
 
-        #Now calculate our own if we aren't broken
-        if self.broken == False:
-            #We only get our own bonuses *Sadface*
+        # Now calculate our own if we aren't broken
+        if not self.broken:
+            # We only get our own bonuses *Sadface*
             store.apply(leader, "fleet")
 
     def recalculateLinear(self, withBoosters=True, dirtyStorage=None):
         self.store = Store()
         self.linearBoosts = {}
         if withBoosters is True:
-            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill("Fleet Command").level >= 1:
+            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill(
+                    "Fleet Command").level >= 1:
                 self.leader.boostsFits.add(self.wings[0].squads[0].members[0].ID)
                 self.leader.calculateModifiedAttributes()
                 self.store.set(self.leader, "squad", clearingUpdate=True)
@@ -83,10 +88,12 @@ def __deepcopy__(self, memo):
 
         return copy
 
+
 class Wing(object):
     def calculateModifiedAttributes(self):
         for c in chain(self.squads, (self.leader,)):
-            if c is not None: c.calculateModifiedAttributes()
+            if c is not None:
+                c.calculateModifiedAttributes()
 
     def calculateGangBonusses(self, store):
         self.broken = False
@@ -95,24 +102,26 @@ def calculateGangBonusses(self, store):
 
         store.set(booster, "wing")
 
-        #ALWAYS move down
+        # ALWAYS move down
         for squad in self.squads:
             squad.calculateGangBonusses(store)
 
         # Check skill requirements and squad amount to see if we break or not
-        if len(self.squads) == 0 or leader is None or leader.character is None or leader.character.getSkill("Wing Command").level < len(self.squads):
+        if len(self.squads) == 0 or leader is None or leader.character is None or leader.character.getSkill(
+                "Wing Command").level < len(self.squads):
             self.broken = True
 
-        #Check if we aren't broken, if we aren't, boost
-        if self.broken == False:
+        # Check if we aren't broken, if we aren't, boost
+        if not self.broken:
             store.apply(leader, "wing")
         else:
-            #We broke, don't go up
+            # We broke, don't go up
             self.gang.broken = True
 
     def recalculateLinear(self, store, withBoosters=True, dirtyStorage=None):
         if withBoosters is True:
-            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill("Wing Command").level >= 1:
+            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill(
+                    "Wing Command").level >= 1:
                 self.leader.boostsFits.add(self.squads[0].members[0].ID)
                 self.leader.calculateModifiedAttributes()
                 store.set(self.leader, "squad", clearingUpdate=False)
@@ -162,10 +171,11 @@ def calculateGangBonusses(self, store):
         store.set(booster, "squad")
 
         # Check skill requirements and squad size to see if we break or not
-        if len(self.members) <= 0 or leader is None or leader.character is None or leader.character.getSkill("Leadership").level * 2 < len(self.members):
+        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:
@@ -173,7 +183,8 @@ def calculateGangBonusses(self, store):
 
     def recalculateLinear(self, store, withBoosters=True, dirtyStorage=None):
         if withBoosters is True:
-            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill("Leadership").level >= 1:
+            if self.leader is not None and self.leader.character is not None and self.leader.character.getSkill(
+                    "Leadership").level >= 1:
                 self.leader.boostsFits.add(self.members[0].ID)
                 self.leader.calculateModifiedAttributes(dirtyStorage=dirtyStorage)
                 store.set(self.leader, "squad", clearingUpdate=False)
@@ -231,6 +242,7 @@ def __deepcopy__(self, memo):
 
         return copy
 
+
 class Store(object):
     def __init__(self):
         # Container for gang boosters and their respective bonuses, three-layered
diff --git a/eos/saveddata/implant.py b/eos/saveddata/implant.py
index a4a6de74dd..ef6852c2c5 100644
--- a/eos/saveddata/implant.py
+++ b/eos/saveddata/implant.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,16 +15,19 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
-from eos.effectHandlerHelpers import HandledItem
 from sqlalchemy.orm import validates, reconstructor
+
 import eos.db
-import logging
+from eos.effectHandlerHelpers import HandledItem
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 
 logger = logging.getLogger(__name__)
 
+
 class Implant(HandledItem, ItemAttrShortcut):
     def __init__(self, item):
         self.__item = item
@@ -76,7 +79,7 @@ def item(self):
         return self.__item
 
     def __calculateSlot(self, item):
-        if not "implantness" in item.attributes:
+        if "implantness" not in item.attributes:
             raise ValueError("Passed item is not an implant")
 
         return int(item.attributes["implantness"].value)
@@ -84,9 +87,11 @@ def __calculateSlot(self, item):
     def clear(self):
         self.itemModifiedAttributes.clear()
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
-        if forceProjected: return
-        if self.active == False: return
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
+        if forceProjected:
+            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",))
@@ -94,11 +99,13 @@ def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
     @validates("fitID", "itemID", "active")
     def validator(self, key, val):
         map = {"fitID": lambda val: isinstance(val, int),
-               "itemID" : lambda val: isinstance(val, int),
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def __deepcopy__(self, memo):
         copy = Implant(self.item)
diff --git a/eos/saveddata/implantSet.py b/eos/saveddata/implantSet.py
index 8e495c5ea8..2daaaa3eba 100644
--- a/eos/saveddata/implantSet.py
+++ b/eos/saveddata/implantSet.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2016 Ryan Holmes
 #
 # This file is part of eos.
@@ -15,11 +15,13 @@
 #
 # 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.effectHandlerHelpers import HandledImplantBoosterList
 from copy import deepcopy
 
+from eos.effectHandlerHelpers import HandledImplantBoosterList
+
+
 class ImplantSet(object):
     def __init__(self, name=None):
         self.name = name
@@ -31,12 +33,12 @@ def implants(self):
 
     @classmethod
     def exportSets(cls, *sets):
-        out  = "# Exported from pyfa\n#\n" \
-               "# Values are in following format:\n" \
-               "# [Implant Set name]\n" \
-               "# [Implant name]\n" \
-               "# [Implant name]\n" \
-               "# ...\n\n"
+        out = "# Exported from pyfa\n#\n" \
+              "# Values are in following format:\n" \
+              "# [Implant Set name]\n" \
+              "# [Implant name]\n" \
+              "# [Implant name]\n" \
+              "# ...\n\n"
 
         for set in sets:
             out += "[{}]\n".format(set.name)
diff --git a/eos/saveddata/miscData.py b/eos/saveddata/miscData.py
index c7a859afe8..909b574bc3 100644
--- a/eos/saveddata/miscData.py
+++ b/eos/saveddata/miscData.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2011 Anton Vorobyov
 #
 # This file is part of eos.
@@ -15,10 +15,11 @@
 #
 # 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.eqBase import EqBase
 
+
 class MiscData(EqBase):
     def __init__(self, name, val=None):
         self.fieldName = name
diff --git a/eos/saveddata/mode.py b/eos/saveddata/mode.py
index 91fbaf6ebe..f494d8d9f0 100644
--- a/eos/saveddata/mode.py
+++ b/eos/saveddata/mode.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 eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
 from eos.effectHandlerHelpers import HandledItem
-import eos.db
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut
+
 
 class Mode(ItemAttrShortcut, HandledItem):
     def __init__(self, item):
 
         if item.group.name != "Ship Modifiers":
-            raise ValueError('Passed item "%s" (category: (%s)) is not a Ship Modifier'%(item.name, item.category.name))
+            raise ValueError(
+                'Passed item "%s" (category: (%s)) is not a Ship Modifier' % (item.name, item.category.name))
 
         self.__item = item
         self.__itemModifiedAttributes = ModifiedAttributeDict()
@@ -47,8 +48,8 @@ def fits(self, fit):
     def clear(self):
         self.itemModifiedAttributes.clear()
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
         if self.item:
             for effect in self.item.effects.itervalues():
                 if effect.runTime == runTime:
-                    effect.handler(fit, self, context = ("module",))
+                    effect.handler(fit, self, context=("module",))
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 049e989394..ec19cc19b3 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,27 +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/>.
-#===============================================================================
+# ===============================================================================
+
+import logging
 
 from sqlalchemy.orm import validates, reconstructor
 
-from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
+import eos.db
 from eos.effectHandlerHelpers import HandledItem, HandledCharge
 from eos.enum import Enum
 from eos.mathUtils import floorFloat
-import eos.db
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, ChargeAttrShortcut
 from eos.types import Citadel
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 class State(Enum):
+    def __init__(self):
+        pass
+
     OFFLINE = -1
     ONLINE = 0
     ACTIVE = 1
     OVERHEATED = 2
 
+
 class Slot(Enum):
+    def __init__(self):
+        pass
+
     # These are self-explanatory
     LOW = 1
     MED = 2
@@ -54,15 +63,20 @@ class Slot(Enum):
     F_SUPPORT = 11
     F_HEAVY = 12
 
+
 class Hardpoint(Enum):
+    def __init__(self):
+        pass
+
     NONE = 0
     MISSILE = 1
     TURRET = 2
 
+
 class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
     """An instance of this class represents a module together with its charge and modified attributes"""
     DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
-    MINING_ATTRIBUTES = ("miningAmount", )
+    MINING_ATTRIBUTES = ("miningAmount",)
 
     def __init__(self, item):
         """Initialize a module from the program"""
@@ -127,7 +141,6 @@ def build(self):
             self.__chargeModifiedAttributes.original = self.__charge.attributes
             self.__chargeModifiedAttributes.overrides = self.__charge.overrides
 
-
     @classmethod
     def buildEmpty(cls, slot):
         empty = Module(None)
@@ -236,7 +249,8 @@ def maxRange(self):
                  "shipScanRange", "surveyScanRange")
         for attr in attrs:
             maxRange = self.getModifiedItemAttr(attr)
-            if maxRange is not None: return maxRange
+            if maxRange is not None:
+                return maxRange
         if self.charge is not None:
             try:
                 chargeName = self.charge.group.name
@@ -252,7 +266,7 @@ def maxRange(self):
             mass = self.getModifiedChargeAttr("mass")
             agility = self.getModifiedChargeAttr("agility")
             if maxVelocity and flightTime and mass and agility:
-                accelTime =  min(flightTime, mass*agility/1000000)
+                accelTime = min(flightTime, mass * agility / 1000000)
                 # Average distance done during acceleration
                 duringAcceleration = maxVelocity / 2 * accelTime
                 # Distance done after being at full speed
@@ -264,13 +278,13 @@ def falloff(self):
         attrs = ("falloffEffectiveness", "falloff", "shipScanFalloff")
         for attr in attrs:
             falloff = self.getModifiedItemAttr(attr)
-            if falloff is not None: return falloff
+            if falloff is not None:
+                return falloff
 
     @property
     def slot(self):
         return self.__slot
 
-
     @property
     def itemModifiedAttributes(self):
         return self.__itemModifiedAttributes
@@ -302,7 +316,7 @@ def charge(self, charge):
         self.__itemModifiedAttributes.clear()
 
     def damageStats(self, targetResists):
-        if self.__dps == None:
+        if self.__dps is None:
             self.__dps = 0
             self.__volley = 0
 
@@ -312,7 +326,9 @@ def damageStats(self, targetResists):
                 else:
                     func = self.getModifiedItemAttr
 
-                volley = sum(map(lambda attr: (func("%sDamage"%attr) or 0) * (1-getattr(targetResists, "%sAmount"%attr, 0)), self.DAMAGE_TYPES))
+                volley = sum(map(
+                    lambda attr: (func("%sDamage" % attr) or 0) * (1 - getattr(targetResists, "%sAmount" % attr, 0)),
+                    self.DAMAGE_TYPES))
                 volley *= self.getModifiedItemAttr("damageMultiplier") or 1
                 if volley:
                     cycleTime = self.cycleTime
@@ -323,12 +339,13 @@ def damageStats(self, targetResists):
 
     @property
     def miningStats(self):
-        if self.__miningyield == None:
+        if self.__miningyield is None:
             if self.isEmpty:
                 self.__miningyield = 0
             else:
                 if self.state >= State.ACTIVE:
-                    volley = self.getModifiedItemAttr("specialtyMiningAmount") or self.getModifiedItemAttr("miningAmount") or 0
+                    volley = self.getModifiedItemAttr("specialtyMiningAmount") or self.getModifiedItemAttr(
+                        "miningAmount") or 0
                     if volley:
                         cycleTime = self.cycleTime
                         self.__miningyield = volley / (cycleTime / 1000.0)
@@ -393,7 +410,8 @@ def fits(self, fit, hardpointLimit=True):
                 if shipGroup is not None:
                     fitsOnGroup.add(shipGroup)
 
-        if (len(fitsOnGroup) > 0 or len(fitsOnType) > 0) and fit.ship.item.group.ID not in fitsOnGroup and fit.ship.item.ID not in fitsOnType:
+        if (len(fitsOnGroup) > 0 or len(
+                fitsOnType) > 0) and fit.ship.item.group.ID not in fitsOnGroup and fit.ship.item.ID not in fitsOnType:
             return False
 
         # AFAIK Citadel modules will always be restricted based on canFitShipType/Group. If we are fitting to a Citadel
@@ -430,7 +448,8 @@ def fits(self, fit, hardpointLimit=True):
                 if (fit.ship.getModifiedItemAttr('turretSlotsLeft') or 0) - fit.getHardpointsUsed(Hardpoint.TURRET) < 1:
                     return False
             elif self.hardpoint == Hardpoint.MISSILE:
-                if (fit.ship.getModifiedItemAttr('launcherSlotsLeft')or 0) - fit.getHardpointsUsed(Hardpoint.MISSILE) < 1:
+                if (fit.ship.getModifiedItemAttr('launcherSlotsLeft') or 0) - fit.getHardpointsUsed(
+                        Hardpoint.MISSILE) < 1:
                     return False
 
         return True
@@ -439,7 +458,7 @@ def isValidState(self, state):
         """
         Check if the state is valid for this module, without considering other modules at all
         """
-        #Check if we're within bounds
+        # Check if we're within bounds
         if state < -1 or state > 2:
             return False
         elif state >= State.ACTIVE and not self.item.isType("active"):
@@ -480,7 +499,10 @@ def canHaveState(self, state=None, projectedOnto=None):
             # Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions
             # (all effects which apply instant modification are exception, generally speaking)
             if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1:
-                offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff"))
+                offensiveNonModifiers = {"energyDestabilizationNew",
+                                         "leech",
+                                         "energyNosferatuFalloff",
+                                         "energyNeutralizerFalloff"}
                 if not offensiveNonModifiers.intersection(set(item.effects)):
                     return False
             # If assistive modules are not allowed, do not let to apply these altogether
@@ -489,8 +511,9 @@ def canHaveState(self, state=None, projectedOnto=None):
             return True
 
     def isValidCharge(self, charge):
-        #Check sizes, if 'charge size > module volume' it won't fit
-        if charge is None: return True
+        # Check sizes, if 'charge size > module volume' it won't fit
+        if charge is None:
+            return True
         chargeVolume = charge.volume
         moduleCapacity = self.item.capacity
         if chargeVolume is not None and moduleCapacity is not None and chargeVolume > moduleCapacity:
@@ -505,8 +528,10 @@ def isValidCharge(self, charge):
         chargeGroup = charge.groupID
         for i in range(5):
             itemChargeGroup = self.getModifiedItemAttr('chargeGroup' + str(i))
-            if itemChargeGroup is None: continue
-            if itemChargeGroup == chargeGroup: return True
+            if itemChargeGroup is None:
+                continue
+            if itemChargeGroup == chargeGroup:
+                return True
 
         return False
 
@@ -518,14 +543,14 @@ def getValidCharges(self):
                 g = eos.db.getGroup(int(itemChargeGroup), eager=("items.icon", "items.attributes"))
                 if g is None:
                     continue
-                for i in g.items:
-                    if i.published and self.isValidCharge(i):
-                        validCharges.add(i)
+                for singleItem in g.items:
+                    if singleItem.published and self.isValidCharge(singleItem):
+                        validCharges.add(singleItem)
 
         return validCharges
 
     def __calculateHardpoint(self, item):
-        effectHardpointMap = {"turretFitted" : Hardpoint.TURRET,
+        effectHardpointMap = {"turretFitted": Hardpoint.TURRET,
                               "launcherFitted": Hardpoint.MISSILE}
 
         if item is None:
@@ -538,11 +563,11 @@ def __calculateHardpoint(self, item):
         return Hardpoint.NONE
 
     def __calculateSlot(self, item):
-        effectSlotMap = {"rigSlot" : Slot.RIG,
-                         "loPower" : Slot.LOW,
-                         "medPower" : Slot.MED,
-                         "hiPower" : Slot.HIGH,
-                         "subSystem" : Slot.SUBSYSTEM,
+        effectSlotMap = {"rigSlot": Slot.RIG,
+                         "loPower": Slot.LOW,
+                         "medPower": Slot.MED,
+                         "hiPower": Slot.HIGH,
+                         "subSystem": Slot.SUBSYSTEM,
                          "serviceSlot": Slot.SERVICE}
         if item is None:
             return None
@@ -557,11 +582,13 @@ def __calculateSlot(self, item):
     @validates("ID", "itemID", "ammoID")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "itemID" : lambda val: val is None or isinstance(val, int),
-               "ammoID" : lambda val: isinstance(val, int)}
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
 
     def clear(self):
         self.__dps = None
@@ -573,15 +600,15 @@ def clear(self):
         self.itemModifiedAttributes.clear()
         self.chargeModifiedAttributes.clear()
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
-        #We will run the effect when two conditions are met:
-        #1: It makes sense to run the effect
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
+        # We will run the effect when two conditions are met:
+        # 1: It makes sense to run the effect
         #    The effect is either offline
         #    or the effect is passive and the module is in the online state (or higher)
 
         #    or the effect is active and the module is in the active state (or higher)
         #    or the effect is overheat and the module is in the overheated state (or higher)
-        #2: the runtimes match
+        # 2: the runtimes match
 
         if self.projected or forceProjected:
             context = "projected", "module"
@@ -601,17 +628,17 @@ def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
             if self.state >= State.OVERHEATED:
                 for effect in self.item.effects.itervalues():
                     if effect.runTime == runTime and \
-                       effect.isType("overheat") and \
-                       not forceProjected:
+                            effect.isType("overheat") and \
+                            not forceProjected:
                         effect.handler(fit, self, context)
 
             for effect in self.item.effects.itervalues():
                 if effect.runTime == runTime and \
-                (effect.isType("offline") or
-                (effect.isType("passive") and self.state >= State.ONLINE) or \
-                (effect.isType("active") and self.state >= State.ACTIVE)) and \
-                ((projected and effect.isType("projected")) or not projected):
-                        effect.handler(fit, self, context)
+                        (effect.isType("offline") or
+                             (effect.isType("passive") and self.state >= State.ONLINE) or
+                             (effect.isType("active") and self.state >= State.ACTIVE)) and \
+                        ((projected and effect.isType("projected")) or not projected):
+                    effect.handler(fit, self, context)
 
     @property
     def cycleTime(self):
@@ -669,9 +696,10 @@ def __repr__(self):
         else:
             return "EmptyModule() at {}".format(hex(id(self)))
 
+
 class Rack(Module):
-    '''
+    """
     This is simply the Module class named something else to differentiate
     it for app logic. This class does not do anything special
-    '''
+    """
     pass
diff --git a/eos/saveddata/override.py b/eos/saveddata/override.py
index b33875e89b..c4f8a1e027 100644
--- a/eos/saveddata/override.py
+++ b/eos/saveddata/override.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2015 Ryan Holmes
 #
 # This file is part of eos.
@@ -15,17 +15,19 @@
 #
 # 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.eqBase import EqBase
-from sqlalchemy.orm import validates, reconstructor
-import eos.db
 import logging
 
+from sqlalchemy.orm import reconstructor
+
+import eos.db
+from eos.eqBase import EqBase
+
 logger = logging.getLogger(__name__)
 
-class Override(EqBase):
 
+class Override(EqBase):
     def __init__(self, item, attr, value):
         self.itemID = item.ID
         self.__item = item
diff --git a/eos/saveddata/price.py b/eos/saveddata/price.py
index ea9b0ac921..8074373dfa 100644
--- a/eos/saveddata/price.py
+++ b/eos/saveddata/price.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 # Copyright (C) 2011 Anton Vorobyov
 #
@@ -16,13 +16,14 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
+# ===============================================================================
 
 import time
+
 from sqlalchemy.orm import reconstructor
 
-class Price(object):
 
+class Price(object):
     def __init__(self, typeID):
         self.typeID = typeID
         self.time = 0
diff --git a/eos/saveddata/ship.py b/eos/saveddata/ship.py
index 4094534e68..80f961331d 100644
--- a/eos/saveddata/ship.py
+++ b/eos/saveddata/ship.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,16 +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 eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, cappingAttrKeyCache
+import logging
+
+import eos.db
 from eos.effectHandlerHelpers import HandledItem
+from eos.modifiedAttributeDict import ModifiedAttributeDict, ItemAttrShortcut, cappingAttrKeyCache
 from eos.saveddata.mode import Mode
-import eos.db
-import logging
 
 logger = logging.getLogger(__name__)
 
+
 class Ship(ItemAttrShortcut, HandledItem):
     EXTRA_ATTRIBUTES = {
         "armorRepair": 0,
@@ -50,7 +52,7 @@ def __init__(self, item, parent=None):
         self.__itemModifiedAttributes.original = dict(self.item.attributes)
         self.__itemModifiedAttributes.original.update(self.EXTRA_ATTRIBUTES)
         self.__itemModifiedAttributes.overrides = self.item.overrides
-        
+
         if "maximumRangeCap" in self.__itemModifiedAttributes.original:
             cappingAttrKeyCache["maxTargetRange"] = "maximumRangeCap"
 
@@ -61,7 +63,8 @@ def __init__(self, item, parent=None):
 
     def validate(self, item):
         if item.category.name != "Ship":
-            raise ValueError('Passed item "%s" (category: (%s)) is not under Ship category'%(item.name, item.category.name))
+            raise ValueError(
+                'Passed item "%s" (category: (%s)) is not under Ship category' % (item.name, item.category.name))
 
     @property
     def item(self):
@@ -75,8 +78,9 @@ def clear(self):
         self.itemModifiedAttributes.clear()
         self.commandBonus = 0
 
-    def calculateModifiedAttributes(self, fit, runTime, forceProjected = False):
-        if forceProjected: return
+    def calculateModifiedAttributes(self, fit, runTime, forceProjected=False):
+        if forceProjected:
+            return
         for effect in self.item.effects.itervalues():
             if effect.runTime == runTime and effect.isType("passive"):
                 # Ships have effects that utilize the level of a skill as an
diff --git a/eos/saveddata/targetResists.py b/eos/saveddata/targetResists.py
index 8798ebf19d..8b286b3f60 100644
--- a/eos/saveddata/targetResists.py
+++ b/eos/saveddata/targetResists.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2014 Ryan Holmes
 #
 # 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/>.
-#===============================================================================
+# ===============================================================================
 
 import re
 
+
 class TargetResists(object):
     # also determined import/export order - VERY IMPORTANT
     DAMAGE_TYPES = ("em", "thermal", "kinetic", "explosive")
 
-    def __init__(self, emAmount = 0, thermalAmount = 0, kineticAmount = 0, explosiveAmount = 0):
+    def __init__(self, emAmount=0, thermalAmount=0, kineticAmount=0, explosiveAmount=0):
         self.emAmount = emAmount
         self.thermalAmount = thermalAmount
         self.kineticAmount = kineticAmount
@@ -38,8 +39,8 @@ def importPatterns(cls, text):
             try:
                 if line.strip()[0] == "#":  # comments
                     continue
-                line = line.split('#',1)[0]  # allows for comments
-                type, data = line.rsplit('=',1)
+                line = line.split('#', 1)[0]  # allows for comments
+                type, data = line.rsplit('=', 1)
                 type, data = type.strip(), data.split(',')
             except:
                 # Data isn't in correct format, continue to next line
@@ -56,11 +57,11 @@ def importPatterns(cls, text):
                 val = float(val)
                 try:
                     assert 0 <= val <= 100
-                    fields["%sAmount" % cls.DAMAGE_TYPES[index]] = val/100
+                    fields["%sAmount" % cls.DAMAGE_TYPES[index]] = val / 100
                 except:
                     continue
 
-            if len(fields) == 4: # Avoid possible blank lines
+            if len(fields) == 4:  # Avoid possible blank lines
                 pattern = TargetResists(**fields)
                 pattern.name = name.strip()
                 patterns.append(pattern)
@@ -68,13 +69,15 @@ def importPatterns(cls, text):
         return patterns, numPatterns
 
     EXPORT_FORMAT = "TargetResists = %s,%.1f,%.1f,%.1f,%.1f\n"
+
     @classmethod
     def exportPatterns(cls, *patterns):
-        out  = "# Exported from pyfa\n#\n"
+        out = "# Exported from pyfa\n#\n"
         out += "# Values are in following format:\n"
         out += "# TargetResists = [name],[EM %],[Thermal %],[Kinetic %],[Explosive %]\n\n"
         for dp in patterns:
-            out += cls.EXPORT_FORMAT % (dp.name, dp.emAmount*100, dp.thermalAmount*100, dp.kineticAmount*100, dp.explosiveAmount*100)
+            out += cls.EXPORT_FORMAT % (
+            dp.name, dp.emAmount * 100, dp.thermalAmount * 100, dp.kineticAmount * 100, dp.explosiveAmount * 100)
 
         return out.strip()
 
diff --git a/eos/saveddata/user.py b/eos/saveddata/user.py
index 1baeb93ce4..8c3905a0dc 100644
--- a/eos/saveddata/user.py
+++ b/eos/saveddata/user.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,17 +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.orm import validates
 import hashlib
-import string
 import random
+import string
+
+from sqlalchemy.orm import validates
+
 
 class User(object):
-    def __init__(self, username, password = None, admin = False):
+    def __init__(self, username, password=None, admin=False):
         self.username = username
-        if password is not None: self.encodeAndSetPassword(password)
+        if password is not None:
+            self.encodeAndSetPassword(password)
         self.admin = admin
 
     def encodeAndSetPassword(self, pw):
@@ -36,7 +39,8 @@ def encodeAndSetPassword(self, pw):
         self.password = ("%s%s" % (h.hexdigest(), salt))
 
     def isPasswordValid(self, pw):
-        if self.password is None: return False
+        if self.password is None:
+            return False
         salt = self.password[-32:]
         h = hashlib.new("sha256")
         h.update(pw)
@@ -46,9 +50,11 @@ def isPasswordValid(self, pw):
     @validates("ID", "username", "password", "admin")
     def validator(self, key, val):
         map = {"ID": lambda val: isinstance(val, int),
-               "username" : lambda val: isinstance(val, basestring),
-               "password" : lambda val: isinstance(val, basestring) and len(val) == 96,
-               "admin" : lambda val: isinstance(val, bool)}
+               "username": lambda val: isinstance(val, basestring),
+               "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)
-        else: return val
+        if not map[key](val):
+            raise ValueError(str(val) + " is not a valid value for " + key)
+        else:
+            return val
diff --git a/eos/types.py b/eos/types.py
index 12e7eb2816..cc32f4fa97 100644
--- a/eos/types.py
+++ b/eos/types.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 # Copyright (C) 2010 Diego Duclos
 #
 # This file is part of eos.
@@ -15,10 +15,10 @@
 #
 # 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.gamedata import Attribute, Category, Effect, Group, Icon, Item, MarketGroup, \
-MetaGroup, AttributeInfo, Unit, EffectInfo, MetaType, MetaData, Traits
+    MetaGroup, AttributeInfo, Unit, EffectInfo, MetaType, MetaData, Traits
 from eos.saveddata.price import Price
 from eos.saveddata.user import User
 from eos.saveddata.crestchar import CrestChar