Refactor code
Merge pull request #2 from rubenesc/group-feeds

Refactor code