Some cleaning of field.c