refactor full series collector