Tidy up headers a bit