Refactor company sign up process