invoicing_maker refactored