Markup refactoring.