A little code cleanup with some new user flow cleanup