Code tidy: simplify measurement match