Regular expression simplification, removes 4 lines

Simplify the main regular expression (removes 4 lines!).
It also removes the `dash` callback, which should make it faster in a meaningless way!