invoices_maker refactor