refactored: even more marker organising