Improve regex readability