Cleaned up some code in Game