Fix markup, tidy up.