markup refactoring