Refactor feed