Refactor new goal form and goal data schema