Slightly refactor matcher rotation