Using rule instead of hardcoded trailing punctuation removal