Refactor with cleanMatch.