Markup Cleanup