Generate more cleaned-up markup