Began refactoring Game.java