feed item refactor