Refactored map creation / rendering