Large amount of refactoring for WorldController