refactor form fields