Refactoring collection to set + CVS parser