Refactor|Client|Map Renderer: Minor cleanup refactorings