Better matching - strip punctuation