Refactor Form Helper

Proposed: pull out duplication from form helper. Not completely crazy about this but welcome feedback to help make this more readable.