Signup form refactor