Refactored form, customers