refactor Grib collections