#2432 - Fixing code formatting and default transaction_id