Refactoring to use Form Helpers