refactor form field