HTML markup cleanup