ensure that indexing on all transaction types works as expected
merge
Merge pull request #198 from balanced/refac

Refactoring