Markers clear on map movement
Refactor code