refactored form functionaliy