Cleaned up GameMaster class