Markup cleanup