Some markup cleanup