refactoring form fields