marker refactor