diff --git a/eos/effects/adaptivearmorhardener.py b/eos/effects/adaptivearmorhardener.py
index 33e9f143c..e25fe48d4 100644
--- a/eos/effects/adaptivearmorhardener.py
+++ b/eos/effects/adaptivearmorhardener.py
@@ -15,8 +15,6 @@ def handler(fit, module, context):
 
     # Skip if there is no damage pattern. Example: projected ships or fleet boosters
     if damagePattern:
-        # logger.debug("Damage Pattern: %f/%f/%f/%f", damagePattern.emAmount, damagePattern.thermalAmount, damagePattern.kineticAmount, damagePattern.explosiveAmount)
-        # logger.debug("Original Armor Resists: %f/%f/%f/%f", fit.ship.getModifiedItemAttr('armorEmDamageResonance'), fit.ship.getModifiedItemAttr('armorThermalDamageResonance'), fit.ship.getModifiedItemAttr('armorKineticDamageResonance'), fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'))
 
         # Populate a tuple with the damage profile modified by current armor resists.
         baseDamageTaken = (
@@ -50,7 +48,6 @@ def handler(fit, module, context):
                 (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
                 (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
             ]
-            # logger.debug("Damage taken this cycle: %f/%f/%f/%f", damagePattern_tuples[0][1], damagePattern_tuples[3][1], damagePattern_tuples[2][1], damagePattern_tuples[1][1])
 
             # Sort the tuple to drop the highest damage value to the bottom
             sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
diff --git a/eos/effects/elitebonuscommanddestroyerinfohidden1.py b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
index 4ffc352e0..cf31b2b1b 100644
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -3,4 +3,7 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
+                                  "commandBonusHidden",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"),
+                                  skill="Command Destroyers")
diff --git a/eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py b/eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
index 7f8e9fec3..cacbd4478 100644
--- a/eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
+++ b/eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
@@ -6,5 +6,11 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
diff --git a/eos/effects/rolebonusremotearmorrepairoptimalfalloff.py b/eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
index c286514f2..fae8acfac 100644
--- a/eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
+++ b/eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
@@ -6,5 +6,9 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("roleBonusRepairRange"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("roleBonusRepairRange"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "falloffEffectiveness",
+                                  src.getModifiedItemAttr("roleBonusRepairRange"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "maxRange",
+                                  src.getModifiedItemAttr("roleBonusRepairRange"))
diff --git a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py b/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
index a8378046b..824f57069 100644
--- a/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
+++ b/eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
@@ -6,8 +6,18 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 26bac09ea..ce351f910 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -487,10 +487,12 @@ class Fit(object):
                         self.ship.boostItemAttr("armor%sDamageResonance" % damageType, value)
 
                 if warfareBuffID == 14:  # Armor Burst: Rapid Repair: Repair Duration/Capacitor
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"),
-                                                  "capacitorNeed", value)
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "duration",
-                                                  value)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
+                                                               mod.item.requiresSkill("Repair Systems"),
+                                                   "capacitorNeed", value)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
+                                                               mod.item.requiresSkill("Repair Systems"),
+                                                   "duration", value)
 
                 if warfareBuffID == 15:  # Armor Burst: Armor Reinforcement: Armor HP
                     self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
@@ -624,7 +626,8 @@ class Fit(object):
                     self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "shieldBonus", value, stackingPenalties=True)
 
                 if warfareBuffID == 53:  # Leviathan Effect Generator : Armor RR penalty
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", value, stackingPenalties=True)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                                   "armorDamageAmount", value, stackingPenalties=True)
 
                 if warfareBuffID == 54:  # Ragnarok Effect Generator : Laser and Hybrid Optimal penalty
                     groups = ("Energy Weapon", "Hybrid Weapon")
diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py
index 41fa7584d..194db5a6b 100644
--- a/gui/utils/exportHtml.py
+++ b/gui/utils/exportHtml.py
@@ -230,7 +230,7 @@ class exportHtmlThread(threading.Thread):
                 HTML += (
                     '    <li data-role="collapsible" data-iconpos="right" data-shadow="false" data-corners="false">\n'
                     '      <h2>' + group.groupName + ' <span class="ui-li-count">' + str(groupFits) + '</span></h2>\n'
-                                                                                                      '      <ul data-role="listview" data-shadow="false" data-inset="true" data-corners="false">\n' + HTMLgroup +
+                    '      <ul data-role="listview" data-shadow="false" data-inset="true" data-corners="false">\n' + HTMLgroup +
                     '      </ul>\n'
                     '    </li>'
                 )
diff --git a/pyfa.py b/pyfa.py
index e465b0d5a..4eb9e0b9d 100755
--- a/pyfa.py
+++ b/pyfa.py
@@ -82,7 +82,8 @@ if not hasattr(sys, 'frozen'):
             betaFlag = True if saMatch.group(3) == "b" else False
             saBuild = int(saMatch.group(4)) if not betaFlag else 0
             if saMajor == 0 and (saMinor < 5 or (saMinor == 5 and saBuild < 8)):
-                print("Pyfa requires sqlalchemy 0.5.8 at least  but current sqlalchemy version is %s\nYou can download sqlalchemy (0.5.8+) from http://www.sqlalchemy.org/".format(sqlalchemy.__version__))
+                print("Pyfa requires sqlalchemy 0.5.8 at least  but current sqlalchemy version is %s\n"
+                      "You can download sqlalchemy (0.5.8+) from http://www.sqlalchemy.org/".format(sqlalchemy.__version__))
                 sys.exit(1)
         else:
             print("Unknown sqlalchemy version string format, skipping check")
diff --git a/tox.ini b/tox.ini
index 2274602e3..dea12ad99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,4 +12,6 @@ commands = py.test -vv --cov Pyfa tests/
 
 [testenv:pep8]
 deps = flake8
-commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py --ignore=E126,E127,E128,E501,E731,F401,F403,F405 service gui eos utils config.py pyfa.py --max-line-length=130
+# TODO: Remove F class exceptions once all imports are fixed
+# TODO: Remove E731 and convert lambdas to defs
+commands = flake8 --exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,venv,tests,.tox,build,dist,__init__.py --ignore=E126,E127,E128,E731,F401,F403,F405 service gui eos utils config.py pyfa.py --max-line-length=165