cleaned up regexes