diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
index ed590ffef..71f834b5a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
@@ -75,13 +75,14 @@ public abstract class Skywars extends Game
 
 	public Skywars(ArcadeManager manager, GameType type, String[] description)
 	{
-		this(manager, new Kit[] {
-				new KitIce(manager),
-				new KitFire(manager),
-				new KitAir(manager),
-				new KitMetal(manager),
-				new KitEarth(manager),
-		}, type, description);
+		this(manager, new Kit[]
+				{
+						new KitIce(manager),
+						new KitFire(manager),
+						new KitAir(manager),
+						new KitMetal(manager),
+						new KitEarth(manager),
+				}, type, description);
 	}
 
 	public Skywars(ArcadeManager manager, Kit[] kits, GameType type, String[] description)
@@ -129,10 +130,6 @@ public abstract class Skywars extends Game
 
 		_oreHider = new OreHider();
 
-		_help = new String[] {
-
-		};
-
 		new CompassModule()
 				.setGiveCompassToAlive(true)
 				.register(this);
@@ -144,6 +141,8 @@ public abstract class Skywars extends Game
 				.register(this);
 
 		manager.GetCreature().SetDisableCustomDrops(true);
+
+		registerStatTrackers();
 	}
 
 	@Override
@@ -588,26 +587,6 @@ public abstract class Skywars extends Game
 		}
 	}
 
-	//TODO REIMPLEMENT
-//	@EventHandler
-//	public void onEntityDeathZombie(EntityDeathEvent event)
-//	{
-//		if (event.getEntity() instanceof Zombie)
-//		{
-//			Zombie ent = (Zombie) event.getEntity();
-//
-//			if (_zombies.containsKey(ent))
-//			{
-//				if (ent.getKiller() instanceof Player)
-//				{
-//					Player player = ent.getKiller();
-//
-//					Bukkit.getPluginManager().callEvent(new PlayerKillZombieEvent(player, ent));
-//				}
-//			}
-//		}
-//	}
-
 	@EventHandler
 	public void projectileDamage(CustomDamageEvent event)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
index 1c45c0682..99fd8e040 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
@@ -16,10 +16,9 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.skywars.trackers.TNTStatTracker;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.stats.DeathBomberStatTracker;
-import nautilus.game.arcade.stats.SkywarsKillZombieStatTracker;
-import nautilus.game.arcade.stats.SkywarsTNTStatTracker;
 import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker;
 import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker;
 
@@ -31,50 +30,52 @@ public class SoloSkywars extends Skywars
 	{
 		this(manager, GameType.Skywars);
 
-		registerStatTrackers(
-				new SkywarsTNTStatTracker(this),
-				new DeathBomberStatTracker(this, 3), //TNT Kills
-				new SkywarsKillZombieStatTracker(this),
-				new WinWithoutOpeningChestStatTracker(this),
-				new WinWithoutWearingArmorStatTracker(this));
+		registerStatTrackers
+				(
+						new TNTStatTracker(this),
+						new DeathBomberStatTracker(this, 3), //TNT Kills
+						new WinWithoutOpeningChestStatTracker(this),
+						new WinWithoutWearingArmorStatTracker(this)
+				);
 
-		registerChatStats(
-				Kills,
-				Deaths,
-				KDRatio,
-				BlankLine,
-				Assists,
-				DamageTaken,
-				DamageDealt
-		);
+		registerChatStats
+				(
+						Kills,
+						Deaths,
+						KDRatio,
+						BlankLine,
+						Assists,
+						DamageTaken,
+						DamageDealt
+				);
 	}
-	
+
 	public SoloSkywars(ArcadeManager manager, GameType type)
 	{
-		super(manager, type, 
-				 new String[]
-							{
-					"Free for all battle in the sky!", 
-					"Craft or loot gear for combat",
-					"Last player alive wins!"
-							});
-		
-		this.DamageTeamSelf = true;	
+		super(manager, type,
+				new String[]
+						{
+								"Free for all battle in the sky!",
+								"Craft or loot gear for combat",
+								"Last player alive wins!"
+						});
+
+		DamageTeamSelf = true;
 	}
-	
+
 	public SoloSkywars(ArcadeManager manager, Kit[] kits, GameType type)
 	{
-		super(manager, kits, type, 
-				 new String[]
-							{
-					"Free for all battle in the sky!", 
-					"Craft or loot gear for combat",
-					"Last player alive wins!"
-							});
-		
-		this.DamageTeamSelf = true;	
+		super(manager, kits, type,
+				new String[]
+						{
+								"Free for all battle in the sky!",
+								"Craft or loot gear for combat",
+								"Last player alive wins!"
+						});
+
+		DamageTeamSelf = true;
 	}
-	
+
 	@EventHandler
 	public void CustomTeamGeneration(GameStateChangeEvent event)
 	{
@@ -88,7 +89,7 @@ public class SoloSkywars extends Skywars
 		players.SetName("Players");
 		players.setDisplayName(C.cYellow + C.Bold + "Players");
 	}
-	
+
 	@Override
 	@EventHandler
 	public void ScoreboardUpdate(UpdateEvent event)
@@ -118,7 +119,7 @@ public class SoloSkywars extends Skywars
 
 		Scoreboard.draw();
 	}
-	
+
 	@Override
 	public void EndCheck()
 	{
@@ -126,9 +127,9 @@ public class SoloSkywars extends Skywars
 			return;
 
 		if (GetPlayers(true).size() <= 1)
-		{	
+		{
 			ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true);
-			
+
 			//Announce
 			AnnounceEnd(places);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
index 157e7fde4..51cb2a6bc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
@@ -13,10 +13,9 @@ import mineplex.core.updater.event.UpdateEvent;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.game.GameTeam;
+import nautilus.game.arcade.game.games.skywars.trackers.TNTStatTracker;
 import nautilus.game.arcade.game.modules.TeamModule;
 import nautilus.game.arcade.stats.DeathBomberStatTracker;
-import nautilus.game.arcade.stats.SkywarsKillZombieStatTracker;
-import nautilus.game.arcade.stats.SkywarsTNTStatTracker;
 import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker;
 import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker;
 
@@ -28,22 +27,24 @@ public class TeamSkywars extends Skywars
 	{
 		this(manager, GameType.SkywarsTeams);
 
-		registerStatTrackers(
-				new SkywarsTNTStatTracker(this),
-				new DeathBomberStatTracker(this, 3), //TNT Kills
-				new SkywarsKillZombieStatTracker(this),
-				new WinWithoutOpeningChestStatTracker(this),
-				new WinWithoutWearingArmorStatTracker(this));
+		registerStatTrackers
+				(
+						new TNTStatTracker(this),
+						new DeathBomberStatTracker(this, 3), //TNT Kills
+						new WinWithoutOpeningChestStatTracker(this),
+						new WinWithoutWearingArmorStatTracker(this)
+				);
 
-		registerChatStats(
-				Kills,
-				Deaths,
-				KDRatio,
-				BlankLine,
-				Assists,
-				DamageTaken,
-				DamageDealt
-		);
+		registerChatStats
+				(
+						Kills,
+						Deaths,
+						KDRatio,
+						BlankLine,
+						Assists,
+						DamageTaken,
+						DamageDealt
+				);
 	}
 	
 	public TeamSkywars(ArcadeManager manager, GameType type)