Improve regexes readability