refactoring Invoicing form