Refactor|World|Map: Minor Map cleanup refactorings