Updated the regular expressions to [-\w]. It's really just a preference for the - in front.