some more refactoring for use of Feed class