More field tidying