refactored: more map marker organising