fix checkstyle error
transaction refactorings
Merge pull request #3730 from ahmetmircik/refactor/3.4/transactions

Small refactorings related to transactions