TaxaCount refactoring