Tidy up of the header