refactor story and feed