clean up of field args