Added refactor&user story