Be more Coffeescript-ish
tweak regexes