Markup cleanup;