refactor /opp-new form