ComputeTaxFacade refactor done