Updates to invoice.py, including removing leading/trailing ';'