Tidy up TransactionCalculator