Checkpoint of collection refactoring