More markup cleanup