markers refactor