Stage two of refactoring with BigDecimal