markup cleanup