Tidying up headers.