markup refactor