More refactoring in World.