Refactory TaxRates and Calculator classes