Make the substition step an option
Use a punctuation aware join