Added punctuation filtering in swap so we don't swap punctuation