Cleaned up the code a bit, time to pollish the game!