minor refactoring: transaction type will be in uppercase
Merge branch 'dev'