refactored form organization