InvoiceGenerator cleanup
Remove compareTo from InvoiceItem and use new matches method instead