Refactor to better handle map markers.