SignUp refactor