Refactoring changes and small fix in World.