Tidy up header a bit