A bit of markup cleaning