refactoring feed