Primers scoring hotfix + small refactoring