Tidying up the fields