Clean-up, better BigDecimal etc.