Modify classification patterns for readability

Replace s with _.
Add ~ to signify dashes with whitespace on one or both sides.
Differentiate from dashes only (-) as the latter might not signify a
product code.