Clean up code-InvoiceCtrl