refactored regexes