Tidy up some markup