Cleaned up regexes