diff --git a/tradegen.py b/tradegen.py
index 91c1396..75afdcd 100644
--- a/tradegen.py
+++ b/tradegen.py
@@ -1,6 +1,33 @@
 import datetime,os
 import log,skel,tcgcore,variables
 
+tradelist = []
+previouscard = ""
+for card in tcgcore.ownedcards():
+    if card[0:4] != "sig_":
+        if card == previouscard:
+            tradelist.append(card)
+        else:
+            if not tcgcore.deckmastered(card[:-2]):
+                if not tcgcore.collecting(card[:-2]):
+                    mass = False
+                    for series in variables.masscollect:
+                        try:
+                            if card in variables.masscollect[series]["singles"]:
+                                mass = True
+                        except:
+                            pass
+                    if mass == False:
+                        tradelist.append(card)
+    previouscard = card
+siglist = []
+for card in tcgcore.ownedcards():
+    if card == "sig_" + variables.name.lower():
+        siglist.append(card)
+if variables.keepsig == True:
+    if len(siglist) > 0:
+        siglist.remove(siglist[0])
+
 def tradegen(colour=False):
     if not os.path.isdir("build/trade"):
         os.mkdir("build/trade")
@@ -19,48 +46,22 @@ def tradegen(colour=False):
     if len(variables.tradestatement) > 0:
         content.write(variables.tradestatement + " ")
     content.write("Trade cards <a href=\"" + variables.tradepost + "\">here</a></p>\n<p>")
-    tradelist = []
-    previouscard = ""
-    for card in tcgcore.ownedcards():
-        if card[0:4] != "sig_":
-            if card == previouscard:
-                if colour:
-                    if tcgcore.cardtype(card) == colour:
-                        tradelist.append(card)
-                else:
-                    tradelist.append(card)
-            else:
-                if not tcgcore.deckmastered(card[:-2]):
-                    if not tcgcore.collecting(card[:-2]):
-                        mass = False
-                        for series in variables.masscollect:
-                            try:
-                                if card in variables.masscollect[series]["singles"]:
-                                    mass = True
-                            except:
-                                pass
-                        if mass == False:
-                            if colour:
-                                if tcgcore.cardtype(card) == colour:
-                                    tradelist.append(card)
-                            else:
-                                tradelist.append(card)
-        previouscard = card
-    siglist = []
-    for card in tcgcore.ownedcards():
-        if card == "sig_" + variables.name.lower():
-            siglist.append(card)
-    if variables.keepsig == True:
-        siglist.remove(siglist[0])
+    thetradelist = []
     if colour:
         if colour == "sig":
             for sig in siglist:
-                tradelist.append(sig)
+                thetradelist.append(sig)
+        else:
+            for card in tradelist:
+                if tcgcore.cardtype(card) == colour:
+                    thetradelist.append(card)
     else:
+        for card in tradelist:
+            thetradelist.append(card)
         for sig in siglist:
-            tradelist.append(sig)
-    content.write("<textarea readonly>" + ", ".join(tradelist) + "</textarea>\n<p>")
-    for card in tradelist:
+            thetradelist.append(sig)
+    content.write("<textarea readonly>" + ", ".join(thetradelist) + "</textarea>\n<p>")
+    for card in thetradelist:
         content.write(tcgcore.printcard(card))
     content.write("</p>\n")
     content.close()