transaction refactorings
fix checkstyle error
Merge pull request #3731 from ahmetmircik/refactor/3.3.2/transactions

Small refactorings related to transactions