Refactoring form field builder