BigDecimal refactoring