Reorganizing and refactoring collectors