eliminate dupe matches
minor refactor