Refactor|Map Renderer: Various minor cleanup refactorings