cleaned up diversity and entropy metrics