tidy the headers a bit