Refactor punctuation to delimiter