Cleaned up Game.java