Got the game code pretty significantly cleaned up