streamlining collections
Merge pull request #2 from yerdle/refactor

streamlining collections