Tidying and adding new field names