Refactoring the feeds service