Refactoring step #6 to use form helpers