Markup Refactoring