Stage one Refactoring to BigDecimal