Refactored form fields