Modified to simplify regex string.