diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
index 5f6cca32e..673f1767f 100644
--- a/eos/db/gamedata/queries.py
+++ b/eos/db/gamedata/queries.py
@@ -276,7 +276,6 @@ def getVariations(itemids, groupIDs=None, where=None, eager=None):
         return vars
 
 
-
 @cachedQuery(1, "attr")
 def getAttributeInfo(attr, eager=None):
     if isinstance(attr, basestring):
diff --git a/gui/builtinContextMenus/cargoAmmo.py b/gui/builtinContextMenus/cargoAmmo.py
index 6b1233164..573e4c24f 100644
--- a/gui/builtinContextMenus/cargoAmmo.py
+++ b/gui/builtinContextMenus/cargoAmmo.py
@@ -31,4 +31,5 @@ class CargoAmmo(ContextMenu):
         self.mainFrame.additionsPane.select("Cargo")
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
+
 CargoAmmo.register()
diff --git a/gui/builtinContextMenus/droneStack.py b/gui/builtinContextMenus/droneStack.py
index 687f94906..b7fde1040 100644
--- a/gui/builtinContextMenus/droneStack.py
+++ b/gui/builtinContextMenus/droneStack.py
@@ -33,4 +33,5 @@ class CargoAmmo(ContextMenu):
         self.mainFrame.additionsPane.select("Drones")
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
+
 CargoAmmo.register()
diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py
index c9fe12be6..771e94df3 100644
--- a/gui/builtinContextMenus/metaSwap.py
+++ b/gui/builtinContextMenus/metaSwap.py
@@ -8,6 +8,11 @@ from service.market import Market
 import gui.mainFrame
 import gui.globalEvents as GE
 from gui.contextMenu import ContextMenu
+from eos.saveddata.booster import Booster
+from eos.saveddata.module import Module
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.implant import Implant
 
 
 class MetaSwap(ContextMenu):
@@ -124,13 +129,12 @@ class MetaSwap(ContextMenu):
         fit = sFit.getFit(fitID)
 
         for selected_item in self.selection:
-            if type(selected_item).__name__== 'Module':
+            if isinstance(selected_item, Module):
                 pos = fit.modules.index(selected_item)
                 sFit.changeModule(fitID, pos, item.ID)
 
-            elif type(selected_item).__name__== 'Drone':
+            elif isinstance(selected_item, Drone):
                 drone_count = None
-                drone_index = None
 
                 for idx, drone_stack in enumerate(fit.drones):
                     if drone_stack is selected_item:
@@ -141,9 +145,8 @@ class MetaSwap(ContextMenu):
                 if drone_count:
                     sFit.addDrone(fitID, item.ID, drone_count)
 
-            elif type(selected_item).__name__== 'Fighter':
+            elif isinstance(selected_item, Fighter):
                 fighter_count = None
-                fighter_index = None
 
                 for idx, fighter_stack in enumerate(fit.fighters):
                     # Right now fighters always will have max stack size.
@@ -162,14 +165,14 @@ class MetaSwap(ContextMenu):
 
                 sFit.addFighter(fitID, item.ID)
 
-            elif type(selected_item).__name__== 'Booster':
+            elif isinstance(selected_item, Booster):
                 for idx, booster_stack in enumerate(fit.boosters):
                     if booster_stack is selected_item:
                         sFit.removeBooster(fitID, idx)
                         sFit.addBooster(fitID, item.ID)
                         break
 
-            elif type(selected_item).__name__== 'Implant':
+            elif isinstance(selected_item, Implant):
                 for idx, implant_stack in enumerate(fit.implants):
                     if implant_stack is selected_item:
                         sFit.removeImplant(fitID, idx)
diff --git a/service/market.py b/service/market.py
index 925cbf9b4..e311c94e5 100644
--- a/service/market.py
+++ b/service/market.py
@@ -616,13 +616,13 @@ class Market(object):
                 implant_remove_list.add("Strong ")
                 implant_remove_list.add("Synth ")
 
-                for implant_prefix in ("-6","-7","-8","-9","-10"):
+                for implant_prefix in ("-6", "-7", "-8", "-9", "-10"):
                     for i in range(50):
                         implant_remove_list.add(implant_prefix + str("%02d" % i))
 
                 for text_to_remove in implant_remove_list:
                     if text_to_remove in item.name:
-                        variations_limiter.add(item.name.replace(text_to_remove,""))
+                        variations_limiter.add(item.name.replace(text_to_remove, ""))
 
             # Get parent item
             if alreadyparent is False: