Refactor FeedController