Tidying up headers!