simplify
Merge pull request #178 from ligi/ligi/code_review/simplify_transaction

simplify