refactored form & some copy