Refactoring OTTransaction