Refactored signup process;