Improve regexes