Refactoring person match.