Cleaned up regexes

Used non-capturing groups where applicable