Entropy refactor