refactors in gameworld