Treat commas as punctuation and remove - from regular tokens