diff --git a/config.py b/config.py
index 50894c424..7b366a209 100644
--- a/config.py
+++ b/config.py
@@ -230,7 +230,6 @@ def defLogging():
         ])
 
 
-
 class LoggerWriter(object):
     def __init__(self, level):
         # self.level is really like using log.debug(message)
diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index 3b5206185..3e9350b66 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -258,6 +258,7 @@ class HandledProjectedModList(HandledList):
             return oldEffect.itemID
         return None
 
+
 class HandledProjectedDroneList(HandledDroneCargoList):
     def append(self, proj):
         proj.projected = True
diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py
index 1d487d2ad..11bac08ca 100644
--- a/gui/builtinAdditionPanes/boosterView.py
+++ b/gui/builtinAdditionPanes/boosterView.py
@@ -28,6 +28,7 @@ from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 import gui.fitCommands as cmd
 
+
 class BoosterViewDrop(wx.DropTarget):
     def __init__(self, dropFn, *args, **kwargs):
         super(BoosterViewDrop, self).__init__(*args, **kwargs)
diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py
index d05e4fe8c..ce73e06b8 100644
--- a/gui/builtinAdditionPanes/commandView.py
+++ b/gui/builtinAdditionPanes/commandView.py
@@ -32,6 +32,7 @@ from gui.utils.staticHelpers import DragDropHelper
 from service.fit import Fit
 import gui.fitCommands as cmd
 
+
 class DummyItem(object):
     def __init__(self, txt):
         self.name = txt
@@ -100,7 +101,6 @@ class CommandView(d.Display):
         keycode = event.GetKeyCode()
         if keycode == wx.WXK_DELETE or keycode == wx.WXK_NUMPAD_DELETE:
             fitID = self.mainFrame.getActiveFit()
-            sFit = Fit.getInstance()
             row = self.GetFirstSelected()
             if row != -1:
                 self.mainFrame.command.Submit(cmd.GuiRemoveCommandCommand(fitID, self.get(row).ID))
@@ -218,7 +218,6 @@ class CommandView(d.Display):
             col = self.getColumn(event.Position)
             if col != self.getColIndex(State):
                 fitID = self.mainFrame.getActiveFit()
-                sFit = Fit.getInstance()
                 thing = self.get(row)
                 if thing:  # thing doesn't exist if it's the dummy value
                     self.mainFrame.command.Submit(cmd.GuiRemoveCommandCommand(fitID, thing.ID))
diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py
index e95906ae9..2918c5aa4 100644
--- a/gui/builtinAdditionPanes/droneView.py
+++ b/gui/builtinAdditionPanes/droneView.py
@@ -31,6 +31,7 @@ from service.fit import Fit
 from service.market import Market
 import gui.fitCommands as cmd
 
+
 class DroneViewDrop(wx.DropTarget):
     def __init__(self, dropFn, *args, **kwargs):
         super(DroneViewDrop, self).__init__(*args, **kwargs)
diff --git a/gui/builtinAdditionPanes/implantView.py b/gui/builtinAdditionPanes/implantView.py
index 0e2188e6f..323b7c89b 100644
--- a/gui/builtinAdditionPanes/implantView.py
+++ b/gui/builtinAdditionPanes/implantView.py
@@ -30,6 +30,7 @@ from service.fit import Fit
 from service.market import Market
 import gui.fitCommands as cmd
 
+
 class ImplantView(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, style=wx.TAB_TRAVERSAL)
diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py
index 678d3aa74..09db4d57f 100644
--- a/gui/builtinAdditionPanes/projectedView.py
+++ b/gui/builtinAdditionPanes/projectedView.py
@@ -322,7 +322,6 @@ class ProjectedView(d.Display):
             col = self.getColumn(event.Position)
             if col != self.getColIndex(State):
                 fitID = self.mainFrame.getActiveFit()
-                sFit = Fit.getInstance()
                 thing = self.get(row)
                 if thing:  # thing doesn't exist if it's the dummy value
                     self.mainFrame.command.Submit(cmd.GuiRemoveProjectedCommand(fitID, thing))
diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py
index dc002d52b..3a70896f9 100644
--- a/gui/builtinContextMenus/amount.py
+++ b/gui/builtinContextMenus/amount.py
@@ -12,6 +12,7 @@ from eos.saveddata.fighter import Fighter as es_Fighter
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class ChangeAmount(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/builtinContextMenus/cargoAmmo.py b/gui/builtinContextMenus/cargoAmmo.py
index e80801975..af3a855ac 100644
--- a/gui/builtinContextMenus/cargoAmmo.py
+++ b/gui/builtinContextMenus/cargoAmmo.py
@@ -6,6 +6,7 @@ from service.settings import ContextMenuSettings
 from service.fit import Fit
 import gui.fitCommands as cmd
 
+
 class CargoAmmo(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/builtinContextMenus/commandFits.py b/gui/builtinContextMenus/commandFits.py
index d2dd7ec94..7433efbec 100644
--- a/gui/builtinContextMenus/commandFits.py
+++ b/gui/builtinContextMenus/commandFits.py
@@ -9,6 +9,7 @@ from gui.contextMenu import ContextMenu
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class CommandFits(ContextMenu):
     # Get list of items that define a command fit
     sMkt = Market.getInstance()
@@ -97,7 +98,6 @@ class CommandFits(ContextMenu):
             event.Skip()
             return
 
-        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         self.mainFrame.command.Submit(cmd.GuiAddCommandCommand(fitID, fit.ID))
 
diff --git a/gui/builtinContextMenus/droneSplit.py b/gui/builtinContextMenus/droneSplit.py
index 9701cc10f..462bd7198 100644
--- a/gui/builtinContextMenus/droneSplit.py
+++ b/gui/builtinContextMenus/droneSplit.py
@@ -111,7 +111,6 @@ class DroneStackSplit(wx.Dialog):
             return False
 
 
-
 class DroneSpinner(wx.Dialog):
     def __init__(self, parent, drone, context):
         wx.Dialog.__init__(self, parent, title="Select Amount", size=wx.Size(220, 60))
diff --git a/gui/builtinContextMenus/itemRemove.py b/gui/builtinContextMenus/itemRemove.py
index cbae19145..e5d083471 100644
--- a/gui/builtinContextMenus/itemRemove.py
+++ b/gui/builtinContextMenus/itemRemove.py
@@ -7,6 +7,7 @@ from service.fit import Fit
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class ItemRemove(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py
index 9909ab9fa..83304f4f7 100644
--- a/gui/builtinContextMenus/metaSwap.py
+++ b/gui/builtinContextMenus/metaSwap.py
@@ -17,6 +17,7 @@ from eos.saveddata.implant import Implant
 from eos.saveddata.cargo import Cargo
 import gui.fitCommands as cmd
 
+
 class MetaSwap(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -153,5 +154,4 @@ class MetaSwap(ContextMenu):
         #             sFit.addDrone(fitID, item.ID, drone_count, True)
 
 
-
 MetaSwap.register()
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index 9b9a3a308..30e1b25d6 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -13,6 +13,7 @@ from gui.bitmap_loader import BitmapLoader
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class ModuleAmmoPicker(ContextMenu):
     DAMAGE_TYPES = ("em", "explosive", "kinetic", "thermal")
     MISSILE_ORDER = ("em", "thermal", "kinetic", "explosive", "mixed")
diff --git a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
index 6f19aec96..d0fdbf55b 100644
--- a/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleGlobalAmmoPicker.py
@@ -9,6 +9,7 @@ from service.fit import Fit
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
     def __init__(self):
         super(ModuleGlobalAmmoPicker, self).__init__()
@@ -28,7 +29,6 @@ class ModuleGlobalAmmoPicker(ModuleAmmoPicker):
             event.Skip()
             return
 
-        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         fit = db_getFit(fitID)
 
diff --git a/gui/builtinContextMenus/project.py b/gui/builtinContextMenus/project.py
index dbfa16724..4b41a30e2 100644
--- a/gui/builtinContextMenus/project.py
+++ b/gui/builtinContextMenus/project.py
@@ -7,6 +7,7 @@ from service.fit import Fit
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class Project(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -33,7 +34,6 @@ class Project(ContextMenu):
         return "Project {0} onto Fit".format(itmContext)
 
     def activate(self, fullContext, selection, i):
-        sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         self.mainFrame.command.Submit(cmd.GuiAddProjectedCommand(fitID, selection[0].ID, 'item'))
 
diff --git a/gui/builtinContextMenus/tabbedFits.py b/gui/builtinContextMenus/tabbedFits.py
index 689622c3b..582f4158d 100644
--- a/gui/builtinContextMenus/tabbedFits.py
+++ b/gui/builtinContextMenus/tabbedFits.py
@@ -10,6 +10,7 @@ from gui.contextMenu import ContextMenu
 from gui.builtinViews.emptyView import BlankPage
 import gui.fitCommands as cmd
 
+
 class TabbedFits(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/builtinContextMenus/tacticalMode.py b/gui/builtinContextMenus/tacticalMode.py
index 04c82574f..a8edff27b 100644
--- a/gui/builtinContextMenus/tacticalMode.py
+++ b/gui/builtinContextMenus/tacticalMode.py
@@ -8,6 +8,7 @@ from service.fit import Fit
 from service.settings import ContextMenuSettings
 import gui.fitCommands as cmd
 
+
 class TacticalMode(ContextMenu):
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
diff --git a/gui/builtinContextMenus/whProjector.py b/gui/builtinContextMenus/whProjector.py
index 1ec8252e8..16b1255b5 100644
--- a/gui/builtinContextMenus/whProjector.py
+++ b/gui/builtinContextMenus/whProjector.py
@@ -10,6 +10,7 @@ from itertools import chain
 import re
 import gui.fitCommands as cmd
 
+
 class WhProjector(ContextMenu):
 
     # CCP doesn't currently provide a mapping between the general Environment, and the specific environment effect
diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py
index 88be52aff..05470f97a 100644
--- a/gui/builtinShipBrowser/fitItem.py
+++ b/gui/builtinShipBrowser/fitItem.py
@@ -20,6 +20,7 @@ from service.fit import Fit
 import gui.fitCommands as cmd
 pyfalog = Logger(__name__)
 
+
 class FitItem(SFItem.SFBrowserItem):
     def __init__(self, parent, fitID=None, shipFittingInfo=("Test", "TestTrait", "cnc's avatar", 0, 0, None), shipID=None,
                  itemData=None, graphicID=None,
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index eab0b9fa0..85fbbb8b2 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -450,7 +450,6 @@ class FittingView(d.Display):
             mod1 = fit.modules[srcIdx]
             mod2 = self.mods[dstRow]
 
-
             if not isinstance(mod2, Module):
                 return
 
@@ -622,7 +621,8 @@ class FittingView(d.Display):
             ctrl = event.cmdDown or event.middleIsDown
             click = "ctrl" if ctrl is True else "right" if event.GetButton() == 3 else "left"
 
-            self.mainFrame.command.Submit(cmd.GuiModuleStateChangeCommand(fitID, self.mods[self.GetItemData(row)].modPosition, [mod.modPosition for mod in mods], click))
+            self.mainFrame.command.Submit(cmd.GuiModuleStateChangeCommand(
+                fitID, self.mods[self.GetItemData(row)].modPosition, [mod.modPosition for mod in mods], click))
 
             # update state tooltip
             tooltip = self.activeColumns[col].getToolTip(self.mods[self.GetItemData(row)])
diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index 7060579a7..be972b0f8 100644
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -186,7 +186,7 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
     itemStats,
     damagePattern,
     marketJump,
-    #droneSplit,
+    # droneSplit,
     itemRemove,
     droneRemoveStack,
     ammoPattern,
@@ -202,7 +202,7 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
     priceOptions,
     amount,
     cargoAmmo,
-    #droneStack,
+    # droneStack,
     metaSwap,
     implantSets,
     fighterAbilities,
diff --git a/gui/devTools.py b/gui/devTools.py
index 88486431a..44012128c 100644
--- a/gui/devTools.py
+++ b/gui/devTools.py
@@ -88,7 +88,7 @@ class DevTools(wx.Dialog):
             print(None)
 
     def cmd_print(self, evt):
-        print("="*20)
+        print("=" * 20)
         for x in self.mainFrame.command.GetCommands():
             print("{}{} {}".format("==> " if x == self.mainFrame.command.GetCurrentCommand() else "", x.GetName(), x))
 
diff --git a/gui/fitCommands/calc/fitAddBooster.py b/gui/fitCommands/calc/fitAddBooster.py
index d030c4026..0470b556b 100644
--- a/gui/fitCommands/calc/fitAddBooster.py
+++ b/gui/fitCommands/calc/fitAddBooster.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 from eos.saveddata.booster import Booster
+pyfalog = Logger(__name__)
+
 
 class FitAddBoosterCommand(wx.Command):
     """"
@@ -20,7 +15,7 @@ class FitAddBoosterCommand(wx.Command):
         self.itemID = itemID
         self.new_index = None
         self.old_item = None
-        
+
     def Do(self):
         pyfalog.debug("Adding booster ({0}) to fit ID: {1}", self.itemID, self.fitID)
 
diff --git a/gui/fitCommands/calc/fitAddCargo.py b/gui/fitCommands/calc/fitAddCargo.py
index 85bfae3eb..fff3abd26 100644
--- a/gui/fitCommands/calc/fitAddCargo.py
+++ b/gui/fitCommands/calc/fitAddCargo.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 from eos.saveddata.cargo import Cargo
+pyfalog = Logger(__name__)
+
 
 class FitAddCargoCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitAddCommand.py b/gui/fitCommands/calc/fitAddCommand.py
index 61dbc68b7..660d7b5a0 100644
--- a/gui/fitCommands/calc/fitAddCommand.py
+++ b/gui/fitCommands/calc/fitAddCommand.py
@@ -1,10 +1,4 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/calc/fitAddDrone.py b/gui/fitCommands/calc/fitAddDrone.py
index c92f9fa78..a7b8ed41c 100644
--- a/gui/fitCommands/calc/fitAddDrone.py
+++ b/gui/fitCommands/calc/fitAddDrone.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 from eos.saveddata.drone import Drone
+pyfalog = Logger(__name__)
+
 
 class FitAddDroneCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitAddFighter.py b/gui/fitCommands/calc/fitAddFighter.py
index dfaccbf3d..42ca59be1 100644
--- a/gui/fitCommands/calc/fitAddFighter.py
+++ b/gui/fitCommands/calc/fitAddFighter.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 from eos.saveddata.fighter import Fighter
+pyfalog = Logger(__name__)
+
 
 class FitAddFighterCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitAddImplant.py b/gui/fitCommands/calc/fitAddImplant.py
index ae8ea848b..4e3fd372c 100644
--- a/gui/fitCommands/calc/fitAddImplant.py
+++ b/gui/fitCommands/calc/fitAddImplant.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 from eos.saveddata.implant import Implant
+pyfalog = Logger(__name__)
+
 
 class FitAddImplantCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitAddModule.py b/gui/fitCommands/calc/fitAddModule.py
index 5d1a2c35c..f0d421baf 100644
--- a/gui/fitCommands/calc/fitAddModule.py
+++ b/gui/fitCommands/calc/fitAddModule.py
@@ -1,9 +1,4 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
 from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
@@ -64,7 +59,7 @@ class FitAddModuleCommand(wx.Command):
             # Then, check states of all modules and change where needed. This will recalc if needed
             # self.checkStates(fit, m)
 
-            #fit.fill()
+            # fit.fill()
             eos.db.commit()
 
             self.change = numSlots != len(fit.modules)
diff --git a/gui/fitCommands/calc/fitAddProjectedDrone.py b/gui/fitCommands/calc/fitAddProjectedDrone.py
index 5649b6048..6c2ddf270 100644
--- a/gui/fitCommands/calc/fitAddProjectedDrone.py
+++ b/gui/fitCommands/calc/fitAddProjectedDrone.py
@@ -1,16 +1,7 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
 from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
-from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitAddProjectedEnv.py b/gui/fitCommands/calc/fitAddProjectedEnv.py
index 974f8efa5..f896a77df 100644
--- a/gui/fitCommands/calc/fitAddProjectedEnv.py
+++ b/gui/fitCommands/calc/fitAddProjectedEnv.py
@@ -1,16 +1,7 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
 from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
-from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitAddProjectedFighter.py b/gui/fitCommands/calc/fitAddProjectedFighter.py
index df0163c01..17d50e14b 100644
--- a/gui/fitCommands/calc/fitAddProjectedFighter.py
+++ b/gui/fitCommands/calc/fitAddProjectedFighter.py
@@ -1,14 +1,7 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 from eos.saveddata.fighter import Fighter
-from eos.saveddata.drone import Drone
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitAddProjectedFit.py b/gui/fitCommands/calc/fitAddProjectedFit.py
index 70fdece0a..cd1e1a7f9 100644
--- a/gui/fitCommands/calc/fitAddProjectedFit.py
+++ b/gui/fitCommands/calc/fitAddProjectedFit.py
@@ -1,16 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
-from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitAddProjectedModule.py b/gui/fitCommands/calc/fitAddProjectedModule.py
index 7701e375e..6d2ad3f4f 100644
--- a/gui/fitCommands/calc/fitAddProjectedModule.py
+++ b/gui/fitCommands/calc/fitAddProjectedModule.py
@@ -1,15 +1,7 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module, State
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitChangeCargoQty.py b/gui/fitCommands/calc/fitChangeCargoQty.py
index c737f3c22..2ba30e085 100644
--- a/gui/fitCommands/calc/fitChangeCargoQty.py
+++ b/gui/fitCommands/calc/fitChangeCargoQty.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.drone import Drone
+
 
 class FitChangeCargoQty(wx.Command):
     def __init__(self, fitID, position, amount=1):
diff --git a/gui/fitCommands/calc/fitChangeDroneQty.py b/gui/fitCommands/calc/fitChangeDroneQty.py
index 162431837..8f7e8e801 100644
--- a/gui/fitCommands/calc/fitChangeDroneQty.py
+++ b/gui/fitCommands/calc/fitChangeDroneQty.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class FitChangeDroneQty(wx.Command):
     def __init__(self, fitID, position, amount=1):
         wx.Command.__init__(self, True, "Drone add")
diff --git a/gui/fitCommands/calc/fitChangeFighterQty.py b/gui/fitCommands/calc/fitChangeFighterQty.py
index d8c2af274..4cef20034 100644
--- a/gui/fitCommands/calc/fitChangeFighterQty.py
+++ b/gui/fitCommands/calc/fitChangeFighterQty.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.drone import Drone
+
 
 class FitChangeFighterQty(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitChangeProjectedDroneQty.py b/gui/fitCommands/calc/fitChangeProjectedDroneQty.py
index 0ac99c098..3ca926c17 100644
--- a/gui/fitCommands/calc/fitChangeProjectedDroneQty.py
+++ b/gui/fitCommands/calc/fitChangeProjectedDroneQty.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class FitChangeProjectedDroneQty(wx.Command):
     def __init__(self, fitID, position, amount=1):
         wx.Command.__init__(self, True, "Drone add")
diff --git a/gui/fitCommands/calc/fitChangeProjectedFitQty.py b/gui/fitCommands/calc/fitChangeProjectedFitQty.py
index e379ec883..aa75e8491 100644
--- a/gui/fitCommands/calc/fitChangeProjectedFitQty.py
+++ b/gui/fitCommands/calc/fitChangeProjectedFitQty.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class FitChangeProjectedFitQty(wx.Command):
     """"
     from sFit.changeAmount
@@ -21,7 +16,6 @@ class FitChangeProjectedFitQty(wx.Command):
         self.old_amount = None
 
     def Do(self):
-        fit = eos.db.getFit(self.fitID)
         pfit = eos.db.getFit(self.pfitID)
 
         if not pfit:  # fit was deleted
diff --git a/gui/fitCommands/calc/fitChangeState.py b/gui/fitCommands/calc/fitChangeState.py
index a6a1548cd..4354f6c32 100644
--- a/gui/fitCommands/calc/fitChangeState.py
+++ b/gui/fitCommands/calc/fitChangeState.py
@@ -1,13 +1,14 @@
 import wx
-from service.fit import Fit
+from logbook import Logger
 
 import gui.mainFrame
-from gui import globalEvents as GE
-from logbook import Logger
 from eos.saveddata.module import Module
-pyfalog = Logger(__name__)
+from service.fit import Fit
 import eos.db
 
+pyfalog = Logger(__name__)
+
+
 class FitChangeStatesCommand(wx.Command):
     """
     Fitting command that trys to change the state of modules in [positions]. We use the base module to determine the
diff --git a/gui/fitCommands/calc/fitCloneModule.py b/gui/fitCommands/calc/fitCloneModule.py
index 14c24ddc6..519b653ef 100644
--- a/gui/fitCommands/calc/fitCloneModule.py
+++ b/gui/fitCommands/calc/fitCloneModule.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-pyfalog = Logger(__name__)
 import copy
+pyfalog = Logger(__name__)
+
 
 class FitCloneModuleCommand(wx.Command):
     """
diff --git a/gui/fitCommands/calc/fitRemoveBooster.py b/gui/fitCommands/calc/fitRemoveBooster.py
index f22b6fb8e..14733c93b 100644
--- a/gui/fitCommands/calc/fitRemoveBooster.py
+++ b/gui/fitCommands/calc/fitRemoveBooster.py
@@ -1,6 +1,4 @@
 import wx
-
-#from .helpers import ModuleInfoCache
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/calc/fitRemoveCargo.py b/gui/fitCommands/calc/fitRemoveCargo.py
index 6b92278b3..779c7c757 100644
--- a/gui/fitCommands/calc/fitRemoveCargo.py
+++ b/gui/fitCommands/calc/fitRemoveCargo.py
@@ -1,6 +1,4 @@
 import wx
-
-#from .helpers import ModuleInfoCache
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/calc/fitRemoveCommand.py b/gui/fitCommands/calc/fitRemoveCommand.py
index 57052aa1e..29e681b60 100644
--- a/gui/fitCommands/calc/fitRemoveCommand.py
+++ b/gui/fitCommands/calc/fitRemoveCommand.py
@@ -1,16 +1,10 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
 
-class FitRemoveCommandCommand(wx.Command):  # well that's an unfrtunate name
+class FitRemoveCommandCommand(wx.Command):  # well that's an unfortunate name
     """"
     from sFit.removeCommand
     """
diff --git a/gui/fitCommands/calc/fitRemoveDrone.py b/gui/fitCommands/calc/fitRemoveDrone.py
index 13e96d435..4e1fb0a6a 100644
--- a/gui/fitCommands/calc/fitRemoveDrone.py
+++ b/gui/fitCommands/calc/fitRemoveDrone.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.drone import Drone
+
 
 class FitRemoveDroneCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitRemoveImplant.py b/gui/fitCommands/calc/fitRemoveImplant.py
index 2a834878a..d0f8101cd 100644
--- a/gui/fitCommands/calc/fitRemoveImplant.py
+++ b/gui/fitCommands/calc/fitRemoveImplant.py
@@ -1,6 +1,4 @@
 import wx
-
-#from .helpers import ModuleInfoCache
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
@@ -28,7 +26,7 @@ class FitRemoveImplantCommand(wx.Command):
         return True
 
     def Undo(self):
-        from gui.fitCommands.calc.fitAddImplant import FitAddImplantCommand # Avoid circular import
+        from gui.fitCommands.calc.fitAddImplant import FitAddImplantCommand  # Avoid circular import
         cmd = FitAddImplantCommand(self.fitID, self.old_implant)
         cmd.Do()
         return True
diff --git a/gui/fitCommands/calc/fitRemoveProjectedDrone.py b/gui/fitCommands/calc/fitRemoveProjectedDrone.py
index 3742dc9eb..9d70ade2e 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedDrone.py
+++ b/gui/fitCommands/calc/fitRemoveProjectedDrone.py
@@ -1,15 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitRemoveProjectedEnv.py b/gui/fitCommands/calc/fitRemoveProjectedEnv.py
index b53f40ab0..61b6ee939 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedEnv.py
+++ b/gui/fitCommands/calc/fitRemoveProjectedEnv.py
@@ -1,15 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
 from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
diff --git a/gui/fitCommands/calc/fitRemoveProjectedFighter.py b/gui/fitCommands/calc/fitRemoveProjectedFighter.py
index 186ee0b43..d3550b43e 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedFighter.py
+++ b/gui/fitCommands/calc/fitRemoveProjectedFighter.py
@@ -1,16 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
-from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitRemoveProjectedFit.py b/gui/fitCommands/calc/fitRemoveProjectedFit.py
index 829c7d3ea..66d62ab10 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedFit.py
+++ b/gui/fitCommands/calc/fitRemoveProjectedFit.py
@@ -1,15 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
 from .fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 pyfalog = Logger(__name__)
 
diff --git a/gui/fitCommands/calc/fitRemoveProjectedModule.py b/gui/fitCommands/calc/fitRemoveProjectedModule.py
index ffb398006..46f8dadba 100644
--- a/gui/fitCommands/calc/fitRemoveProjectedModule.py
+++ b/gui/fitCommands/calc/fitRemoveProjectedModule.py
@@ -1,15 +1,6 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
-from eos.saveddata.module import Module
-from eos.saveddata.drone import Drone
-from eos.saveddata.fighter import Fighter
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitRename.py b/gui/fitCommands/calc/fitRename.py
index bd840d41f..38a72c519 100644
--- a/gui/fitCommands/calc/fitRename.py
+++ b/gui/fitCommands/calc/fitRename.py
@@ -1,12 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
-import eos.db
 from logbook import Logger
+
+import eos.db
+
 pyfalog = Logger(__name__)
 
 
diff --git a/gui/fitCommands/calc/fitSetCharge.py b/gui/fitCommands/calc/fitSetCharge.py
index eeb4df407..6cc6d0988 100644
--- a/gui/fitCommands/calc/fitSetCharge.py
+++ b/gui/fitCommands/calc/fitSetCharge.py
@@ -5,8 +5,9 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from eos.saveddata.module import Module
 from logbook import Logger
-pyfalog = Logger(__name__)
 import eos.db
+pyfalog = Logger(__name__)
+
 
 class FitSetChargeCommand(wx.Command):
     def __init__(self, fitID, positions, chargeID=None):
@@ -43,4 +44,4 @@ class FitSetChargeCommand(wx.Command):
                 result = True
                 mod.charge = ammo
         eos.db.commit()
-        return result
\ No newline at end of file
+        return result
diff --git a/gui/fitCommands/calc/fitSetMode.py b/gui/fitCommands/calc/fitSetMode.py
index 183c292aa..750be78dd 100644
--- a/gui/fitCommands/calc/fitSetMode.py
+++ b/gui/fitCommands/calc/fitSetMode.py
@@ -1,10 +1,4 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/calc/fitSwapModule.py b/gui/fitCommands/calc/fitSwapModule.py
index 8f5ff4212..38ed8d4eb 100644
--- a/gui/fitCommands/calc/fitSwapModule.py
+++ b/gui/fitCommands/calc/fitSwapModule.py
@@ -1,10 +1,4 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
diff --git a/gui/fitCommands/calc/fitToggleBooster.py b/gui/fitCommands/calc/fitToggleBooster.py
index 504ab114a..53b56487b 100644
--- a/gui/fitCommands/calc/fitToggleBooster.py
+++ b/gui/fitCommands/calc/fitToggleBooster.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class FitToggleBoosterCommand(wx.Command):
     """"
     from sFit.toggleBooster
diff --git a/gui/fitCommands/calc/fitToggleCommand.py b/gui/fitCommands/calc/fitToggleCommand.py
index c8adc87ac..c7d5a43ad 100644
--- a/gui/fitCommands/calc/fitToggleCommand.py
+++ b/gui/fitCommands/calc/fitToggleCommand.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.implant import Implant
+
 
 class FitToggleCommandCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitToggleDrone.py b/gui/fitCommands/calc/fitToggleDrone.py
index a10796888..b281be700 100644
--- a/gui/fitCommands/calc/fitToggleDrone.py
+++ b/gui/fitCommands/calc/fitToggleDrone.py
@@ -1,14 +1,9 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class FitToggleDroneCommand(wx.Command):
     """"
     from sFit.toggleDrone
diff --git a/gui/fitCommands/calc/fitToggleFighter.py b/gui/fitCommands/calc/fitToggleFighter.py
index d0e2a325c..589b4bdd2 100644
--- a/gui/fitCommands/calc/fitToggleFighter.py
+++ b/gui/fitCommands/calc/fitToggleFighter.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.implant import Implant
+
 
 class FitToggleFighterCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/calc/fitToggleImplant.py b/gui/fitCommands/calc/fitToggleImplant.py
index a44b5f293..c004c297d 100644
--- a/gui/fitCommands/calc/fitToggleImplant.py
+++ b/gui/fitCommands/calc/fitToggleImplant.py
@@ -1,14 +1,8 @@
 import wx
-from service.fit import Fit
-
-import gui.mainFrame
-from gui import globalEvents as GE
-#from .helpers import ModuleInfoCache
-from eos.saveddata.module import Module, State
 import eos.db
 from logbook import Logger
 pyfalog = Logger(__name__)
-from eos.saveddata.implant import Implant
+
 
 class FitToggleImplantCommand(wx.Command):
     """"
diff --git a/gui/fitCommands/guiAddBooster.py b/gui/fitCommands/guiAddBooster.py
index fc89209cb..fc732d857 100644
--- a/gui/fitCommands/guiAddBooster.py
+++ b/gui/fitCommands/guiAddBooster.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddBooster import FitAddBoosterCommand
 
+
 class GuiAddBoosterCommand(wx.Command):
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Booster Add")
@@ -27,4 +28,3 @@ class GuiAddBoosterCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddCargo.py b/gui/fitCommands/guiAddCargo.py
index d23af64bb..4ff0f3447 100644
--- a/gui/fitCommands/guiAddCargo.py
+++ b/gui/fitCommands/guiAddCargo.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddCargo import FitAddCargoCommand
 
+
 class GuiAddCargoCommand(wx.Command):
     def __init__(self, fitID, itemID, amount=1, replace=False):
         wx.Command.__init__(self, True, "Cargo Add")
@@ -27,4 +28,3 @@ class GuiAddCargoCommand(wx.Command):
             self.internal_history.Undo()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddCharge.py b/gui/fitCommands/guiAddCharge.py
index 26ae3bf94..ad6c5a2f2 100644
--- a/gui/fitCommands/guiAddCharge.py
+++ b/gui/fitCommands/guiAddCharge.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitSetCharge import FitSetChargeCommand
 
+
 class GuiModuleAddChargeCommand(wx.Command):
     def __init__(self, fitID, itemID, modules):
         wx.Command.__init__(self, True, "Module Charge Add")
@@ -28,4 +29,3 @@ class GuiModuleAddChargeCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddCommand.py b/gui/fitCommands/guiAddCommand.py
index 38f3a1110..06cfcbe98 100644
--- a/gui/fitCommands/guiAddCommand.py
+++ b/gui/fitCommands/guiAddCommand.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddCommand import FitAddCommandCommand
 
+
 class GuiAddCommandCommand(wx.Command):
     def __init__(self, fitID, commandFitID):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiAddCommandCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddDrone.py b/gui/fitCommands/guiAddDrone.py
index f55f40363..6549d1e21 100644
--- a/gui/fitCommands/guiAddDrone.py
+++ b/gui/fitCommands/guiAddDrone.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddDrone import FitAddDroneCommand
 
+
 class GuiAddDroneCommand(wx.Command):
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Cargo Add")
@@ -27,4 +28,3 @@ class GuiAddDroneCommand(wx.Command):
             self.internal_history.Undo()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddFighter.py b/gui/fitCommands/guiAddFighter.py
index 2e699b53a..01024e706 100644
--- a/gui/fitCommands/guiAddFighter.py
+++ b/gui/fitCommands/guiAddFighter.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddFighter import FitAddFighterCommand
 
+
 class GuiAddFighterCommand(wx.Command):
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Cargo Add")
@@ -27,4 +28,3 @@ class GuiAddFighterCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddImplant.py b/gui/fitCommands/guiAddImplant.py
index d819a55d3..ffbc1e0a4 100644
--- a/gui/fitCommands/guiAddImplant.py
+++ b/gui/fitCommands/guiAddImplant.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitAddImplant import FitAddImplantCommand
 
+
 class GuiAddImplantCommand(wx.Command):
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Implant Add")
@@ -27,4 +28,3 @@ class GuiAddImplantCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiAddModule.py b/gui/fitCommands/guiAddModule.py
index 0964e03ae..f826566f4 100644
--- a/gui/fitCommands/guiAddModule.py
+++ b/gui/fitCommands/guiAddModule.py
@@ -1,7 +1,6 @@
 import wx
 import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
 from .calc.fitAddModule import FitAddModuleCommand
 from .calc.fitReplaceModule import FitReplaceModuleCommand
@@ -60,7 +59,6 @@ class GuiModuleAddCommand(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
diff --git a/gui/fitCommands/guiAddProjected.py b/gui/fitCommands/guiAddProjected.py
index 7bc81bb76..b2114e111 100644
--- a/gui/fitCommands/guiAddProjected.py
+++ b/gui/fitCommands/guiAddProjected.py
@@ -54,4 +54,3 @@ class GuiAddProjectedCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiCargoToModule.py b/gui/fitCommands/guiCargoToModule.py
index 018014081..a2583e47c 100644
--- a/gui/fitCommands/guiCargoToModule.py
+++ b/gui/fitCommands/guiCargoToModule.py
@@ -10,6 +10,7 @@ from .calc.fitAddCargo import FitAddCargoCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class GuiCargoToModuleCommand(wx.Command):
     """
     Moves cargo to fitting window. Can either do a copy, move, or swap with current module
diff --git a/gui/fitCommands/guiChangeCargoQty.py b/gui/fitCommands/guiChangeCargoQty.py
index b8a6c8873..80a906fc3 100644
--- a/gui/fitCommands/guiChangeCargoQty.py
+++ b/gui/fitCommands/guiChangeCargoQty.py
@@ -1,10 +1,6 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
 from .calc.fitChangeCargoQty import FitChangeCargoQty
 from service.fit import Fit
 from logbook import Logger
@@ -29,7 +25,6 @@ class GuiChangeCargoQty(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         for _ in self.internal_history.Commands:
             self.internal_history.Undo()
diff --git a/gui/fitCommands/guiChangeDroneQty.py b/gui/fitCommands/guiChangeDroneQty.py
index 9c27a8945..5aa2ea12e 100644
--- a/gui/fitCommands/guiChangeDroneQty.py
+++ b/gui/fitCommands/guiChangeDroneQty.py
@@ -1,10 +1,6 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
 from .calc.fitChangeDroneQty import FitChangeDroneQty
 from service.fit import Fit
 from logbook import Logger
@@ -29,7 +25,6 @@ class GuiChangeDroneQty(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         for _ in self.internal_history.Commands:
             self.internal_history.Undo()
diff --git a/gui/fitCommands/guiChangeFighterQty.py b/gui/fitCommands/guiChangeFighterQty.py
index 063c6cda5..280bd1a16 100644
--- a/gui/fitCommands/guiChangeFighterQty.py
+++ b/gui/fitCommands/guiChangeFighterQty.py
@@ -1,10 +1,6 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
 from .calc.fitChangeFighterQty import FitChangeFighterQty
 from service.fit import Fit
 from logbook import Logger
@@ -29,7 +25,6 @@ class GuiChangeFighterQty(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
diff --git a/gui/fitCommands/guiChangeProjectedDroneQty.py b/gui/fitCommands/guiChangeProjectedDroneQty.py
index 38fcf31f9..f7ceaa657 100644
--- a/gui/fitCommands/guiChangeProjectedDroneQty.py
+++ b/gui/fitCommands/guiChangeProjectedDroneQty.py
@@ -1,10 +1,6 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
 from .calc.fitChangeProjectedDroneQty import FitChangeProjectedDroneQty
 from service.fit import Fit
 from logbook import Logger
@@ -29,7 +25,6 @@ class GuiChangeProjectedDroneQty(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
diff --git a/gui/fitCommands/guiChangeProjectedFitQty.py b/gui/fitCommands/guiChangeProjectedFitQty.py
index 006876077..7014a808b 100644
--- a/gui/fitCommands/guiChangeProjectedFitQty.py
+++ b/gui/fitCommands/guiChangeProjectedFitQty.py
@@ -1,10 +1,6 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
 from gui import globalEvents as GE
-from .calc.fitAddModule import FitAddModuleCommand
-from .calc.fitReplaceModule import FitReplaceModuleCommand
 from .calc.fitChangeProjectedFitQty import FitChangeProjectedFitQty
 from service.fit import Fit
 from logbook import Logger
@@ -29,7 +25,6 @@ class GuiChangeProjectedFitQty(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
diff --git a/gui/fitCommands/guiFitRename.py b/gui/fitCommands/guiFitRename.py
index 7958a7c53..b9a7a81d7 100644
--- a/gui/fitCommands/guiFitRename.py
+++ b/gui/fitCommands/guiFitRename.py
@@ -1,8 +1,5 @@
 import wx
-import eos.db
 import gui.mainFrame
-from service.fit import Fit
-from gui import globalEvents as GE
 from .calc.fitRename import FitRenameCommand
 from service.fit import Fit
 from logbook import Logger
@@ -25,7 +22,6 @@ class GuiFitRenameCommand(wx.Command):
             return True
         return False
 
-
     def Undo(self):
         pyfalog.debug("{} Undo()".format(self))
         for _ in self.internal_history.Commands:
diff --git a/gui/fitCommands/guiMetaSwap.py b/gui/fitCommands/guiMetaSwap.py
index 9b4af4039..13497a233 100644
--- a/gui/fitCommands/guiMetaSwap.py
+++ b/gui/fitCommands/guiMetaSwap.py
@@ -61,4 +61,3 @@ class GuiMetaSwapCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiModuleToCargo.py b/gui/fitCommands/guiModuleToCargo.py
index c0b483d2c..95e9be0b6 100644
--- a/gui/fitCommands/guiModuleToCargo.py
+++ b/gui/fitCommands/guiModuleToCargo.py
@@ -12,6 +12,7 @@ from .calc.fitAddCargo import FitAddCargoCommand
 from logbook import Logger
 pyfalog = Logger(__name__)
 
+
 class GuiModuleToCargoCommand(wx.Command):
     def __init__(self, fitID, moduleIdx, cargoIdx, copy=False):
         wx.Command.__init__(self, True, "Module State Change")
@@ -31,7 +32,8 @@ class GuiModuleToCargoCommand(wx.Command):
 
         if self.cargoIdx:  # we're swapping with cargo
             if self.copy:  # if copying, simply add item to cargo
-                result = self.internal_history.Submit(FitAddCargoCommand(self.mainFrame.getActiveFit(), module.item.ID if not module.item.isAbyssal else module.baseItemID))
+                result = self.internal_history.Submit(FitAddCargoCommand(
+                    self.mainFrame.getActiveFit(), module.item.ID if not module.item.isAbyssal else module.baseItemID))
             else:  # otherwise, try to swap by replacing module with cargo item. If successful, remove old cargo and add new cargo
 
                 cargo = fit.cargo[self.cargoIdx]
diff --git a/gui/fitCommands/guiRemoveBooster.py b/gui/fitCommands/guiRemoveBooster.py
index 0e96f1c2e..15b504575 100644
--- a/gui/fitCommands/guiRemoveBooster.py
+++ b/gui/fitCommands/guiRemoveBooster.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitRemoveBooster import FitRemoveBoosterCommand
 
+
 class GuiRemoveBoosterCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiRemoveBoosterCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiRemoveCargo.py b/gui/fitCommands/guiRemoveCargo.py
index ec42e4d3c..f9aa5872a 100644
--- a/gui/fitCommands/guiRemoveCargo.py
+++ b/gui/fitCommands/guiRemoveCargo.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitRemoveCargo import FitRemoveCargoCommand
 
+
 class GuiRemoveCargoCommand(wx.Command):
     def __init__(self, fitID, itemID):
         wx.Command.__init__(self, True, "Module Charge Add")
@@ -25,4 +26,3 @@ class GuiRemoveCargoCommand(wx.Command):
             self.internal_history.Undo()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiRemoveCommand.py b/gui/fitCommands/guiRemoveCommand.py
index 351f9697b..206be23c3 100644
--- a/gui/fitCommands/guiRemoveCommand.py
+++ b/gui/fitCommands/guiRemoveCommand.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitRemoveCommand import FitRemoveCommandCommand
 
+
 class GuiRemoveCommandCommand(wx.Command):
     def __init__(self, fitID, commandFitID):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiRemoveCommandCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiRemoveDrone.py b/gui/fitCommands/guiRemoveDrone.py
index 252adc2af..42e651e3d 100644
--- a/gui/fitCommands/guiRemoveDrone.py
+++ b/gui/fitCommands/guiRemoveDrone.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitRemoveDrone import FitRemoveDroneCommand
 
+
 class GuiRemoveDroneCommand(wx.Command):
     def __init__(self, fitID, position, amount=1):
         wx.Command.__init__(self, True, "Cargo Add")
@@ -28,4 +29,3 @@ class GuiRemoveDroneCommand(wx.Command):
             self.internal_history.Undo()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiRemoveImplant.py b/gui/fitCommands/guiRemoveImplant.py
index 7c9c6a4c1..af9ee74bc 100644
--- a/gui/fitCommands/guiRemoveImplant.py
+++ b/gui/fitCommands/guiRemoveImplant.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitRemoveImplant import FitRemoveImplantCommand
 
+
 class GuiRemoveImplantCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -25,4 +26,3 @@ class GuiRemoveImplantCommand(wx.Command):
             self.internal_history.Undo()
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiRemoveModule.py b/gui/fitCommands/guiRemoveModule.py
index 848708856..944a63160 100644
--- a/gui/fitCommands/guiRemoveModule.py
+++ b/gui/fitCommands/guiRemoveModule.py
@@ -19,7 +19,8 @@ class GuiModuleRemoveCommand(wx.Command):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.sFit = Fit.getInstance()
         self.fitID = fitID
-        self.modCache = [ModuleInfoCache(mod.modPosition, mod.item.ID, mod.state, mod.charge, mod.baseItemID, mod.mutaplasmidID) for mod in modules if not mod.isEmpty]
+        self.modCache = [ModuleInfoCache(
+            mod.modPosition, mod.item.ID, mod.state, mod.charge, mod.baseItemID, mod.mutaplasmidID) for mod in modules if not mod.isEmpty]
         self.internal_history = wx.CommandProcessor()
 
     def Do(self):
diff --git a/gui/fitCommands/guiRemoveProjected.py b/gui/fitCommands/guiRemoveProjected.py
index 2bf91b876..74d1ab308 100644
--- a/gui/fitCommands/guiRemoveProjected.py
+++ b/gui/fitCommands/guiRemoveProjected.py
@@ -3,20 +3,19 @@ from service.fit import Fit
 
 import gui.mainFrame
 from gui import globalEvents as GE
-from eos.saveddata.module import Module
 from .calc.fitRemoveProjectedModule import FitRemoveProjectedModuleCommand
 from .calc.fitRemoveProjectedEnv import FitRemoveProjectedEnvCommand
 from .calc.fitRemoveProjectedFit import FitRemoveProjectedFitCommand
 from .calc.fitRemoveProjectedFighter import FitRemoveProjectedFighterCommand
 from logbook import Logger
 from .calc.fitRemoveProjectedDrone import FitRemoveProjectedDroneCommand
-pyfalog = Logger(__name__)
-import eos.db
 
 from eos.saveddata.drone import Drone
 from eos.saveddata.module import Module
 from eos.saveddata.fighter import Fighter
 
+pyfalog = Logger(__name__)
+
 
 class GuiRemoveProjectedCommand(wx.Command):
     mapping = {
@@ -88,4 +87,3 @@ class GuiRemoveProjectedCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiSetMode.py b/gui/fitCommands/guiSetMode.py
index 0ad7b80f6..9639028f9 100644
--- a/gui/fitCommands/guiSetMode.py
+++ b/gui/fitCommands/guiSetMode.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitSetMode import FitSetModeCommand
 
+
 class GuiSetModeCommand(wx.Command):
     def __init__(self, fitID, mode):
         wx.Command.__init__(self, True, "Cargo Add")
@@ -27,4 +28,3 @@ class GuiSetModeCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleBooster.py b/gui/fitCommands/guiToggleBooster.py
index 166ad9648..2a586a888 100644
--- a/gui/fitCommands/guiToggleBooster.py
+++ b/gui/fitCommands/guiToggleBooster.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitToggleBooster import FitToggleBoosterCommand
 
+
 class GuiToggleBoosterCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiToggleBoosterCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleCommand.py b/gui/fitCommands/guiToggleCommand.py
index 85f32c143..50785da26 100644
--- a/gui/fitCommands/guiToggleCommand.py
+++ b/gui/fitCommands/guiToggleCommand.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitToggleCommand import FitToggleCommandCommand
 
+
 class GuiToggleCommandCommand(wx.Command):
     def __init__(self, fitID, commandFitID):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiToggleCommandCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleDrone.py b/gui/fitCommands/guiToggleDrone.py
index 3dc8c4cec..7913df516 100644
--- a/gui/fitCommands/guiToggleDrone.py
+++ b/gui/fitCommands/guiToggleDrone.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitToggleDrone import FitToggleDroneCommand
 
+
 class GuiToggleDroneCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiToggleDroneCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleFighter.py b/gui/fitCommands/guiToggleFighter.py
index eee3c945e..f5aee10d6 100644
--- a/gui/fitCommands/guiToggleFighter.py
+++ b/gui/fitCommands/guiToggleFighter.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitToggleFighter import FitToggleFighterCommand
 
+
 class GuiToggleFighterCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiToggleFighterCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleImplant.py b/gui/fitCommands/guiToggleImplant.py
index e7ae24669..899eff0ee 100644
--- a/gui/fitCommands/guiToggleImplant.py
+++ b/gui/fitCommands/guiToggleImplant.py
@@ -5,6 +5,7 @@ import gui.mainFrame
 from gui import globalEvents as GE
 from .calc.fitToggleImplant import FitToggleImplantCommand
 
+
 class GuiToggleImplantCommand(wx.Command):
     def __init__(self, fitID, position):
         wx.Command.__init__(self, True, "")
@@ -27,4 +28,3 @@ class GuiToggleImplantCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/gui/fitCommands/guiToggleModuleState.py b/gui/fitCommands/guiToggleModuleState.py
index d87339347..71e307f93 100644
--- a/gui/fitCommands/guiToggleModuleState.py
+++ b/gui/fitCommands/guiToggleModuleState.py
@@ -31,4 +31,3 @@ class GuiModuleStateChangeCommand(wx.Command):
         self.sFit.recalc(self.fitID)
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.fitID))
         return True
-
diff --git a/service/fit.py b/service/fit.py
index f5e48706f..f58c5eed4 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -39,10 +39,10 @@ from service.damagePattern import DamagePattern
 from service.settings import SettingsProvider
 from utils.deprecated import deprecated
 import wx
+from service.fitDeprecated import FitDeprecated
 
 pyfalog = Logger(__name__)
 
-from service.fitDeprecated import FitDeprecated
 
 class DeferRecalc():
     def __init__(self, fitID):
@@ -359,9 +359,6 @@ class Fit(FitDeprecated):
         eos.db.commit()
         self.recalc(fit)
 
-
-
-
     def changeMutatedValue(self, mutator, value):
         pyfalog.debug("Changing mutated value for {} / {}: {} => {}".format(mutator.module, mutator.module.mutaplasmid, mutator.value, value))
         mutator.value = value
diff --git a/service/fitDeprecated.py b/service/fitDeprecated.py
index 3edc9aab5..c145b858c 100644
--- a/service/fitDeprecated.py
+++ b/service/fitDeprecated.py
@@ -44,7 +44,7 @@ class FitDeprecated(object):
         old_name = fit.name
         fit.name = newName
         eos.db.commit()
-        return old_name,  newName
+        return old_name, newName
 
     @deprecated
     def toggleDrone(self, fitID, i):
diff --git a/utils/deprecated.py b/utils/deprecated.py
index e7eeb9fad..b3433515e 100644
--- a/utils/deprecated.py
+++ b/utils/deprecated.py
@@ -1,6 +1,7 @@
 import warnings
 import functools
 
+
 def deprecated(func):
     """This is a decorator which can be used to mark functions
     as deprecated. It will result in a warning being emitted