Improve readability of regexps