refactor & restore markers