refactor user stories