clean up findMatch()