Tidying up the header somewhat