Map Renderer Code cleanup