Refactor markup.