Cleaning up some of the user flow