Refactor code into the Feeds service