Refactor user steps