Minor refactor circa transaction_builder