Fix typo, minor refactoring, remove addPunctuation() from client code since it's not used any more.