Diversity estimates refactoring