Small changes on punctuation replacement