Html markup cleanup