Refactor user flow helpers