internal refactoring - better separation between match & entropy
2 files changed