Refactoring in form field