refactor step 6 for form helpers