Cleaned up sign up process