diff --git a/Randomizer.py b/Randomizer.py
index df55d7e..ec6db42 100644
--- a/Randomizer.py
+++ b/Randomizer.py
@@ -3065,7 +3065,7 @@ def start_randomizer(rom, settings):
     if settings['Num']:
         if settings['Num'] > repeat:
             repeat = settings['Num']
-        settings.pop('Num')
+    settings.pop('Num')
     if settings['Patch']:
         Patch = True
     else:
@@ -3124,26 +3124,22 @@ def start_randomizer(rom, settings):
                 elif nodeType == 'Boss':
                     World.add_to_majors(name)
                     BossLocations.append(name)
-                else:
-                    if nodeType == 'Data' or item == 'E-Tank':
-                        World.add_to_majors(name)
-                        if name == 'Data S3':
-                            BossLocations.append(name)
-                if not 'Item' in name:
-                    if not nodeType == 'Boss':
-                        if nodeType == 'Data':
-                            pass
-                AreaItemLocations[areaIndex].append(name)
+                elif nodeType == 'Data' or item == 'E-Tank':
+                    World.add_to_majors(name)
+                    if name == 'Data S3':
+                        BossLocations.append(name)
+                if 'Item' in name or nodeType == 'Boss' or nodeType == 'Data':
+                    AreaItemLocations[areaIndex].append(name)
 
-            World.ConnectAllNodes()
-            StartLocation = 'S0-00'
-            startTime = time.time()
-            randomize_game(World)
-            seedTime = time.time() - startTime
-            print(str(FileName))
-            print('Randomized in:', seedTime)
+        World.ConnectAllNodes()
+        StartLocation = 'S0-00'
+        startTime = time.time()
+        randomize_game(World)
+        seedTime = time.time() - startTime
+        print(str(FileName))
+        print('Randomized in:', seedTime)
 
-        totalRandoTime = time.time() - totalRandoTime
-        print('All seeds took:', totalRandoTime)
-        return FileName
+    totalRandoTime = time.time() - totalRandoTime
+    print('All seeds took:', totalRandoTime)
+    return FileName