Lots more markup cleanup