Refactoring: dictionaries of punctuators are added