Modify regex for readability