try to make regex cleaner
a few changes to make my coffeescript look better