Improve RegEx readability