collections types refactoring