Tidying up header assignment