Refactor form fields for clients and suppliers