removed '-' and '_' as end-of-word designators