Refactoring Markup