Clean up duplicate character class in regex