Updated to use string.punctuation.