clean up invoices a bit more