Cleaner way of dealing with punctuation in C1b