Add back transaction_id; it'll make more sense.  Clean up formatting