working on cleaning up Game.java