refactor user jounery