small reorg for invoice