Clean up regex string #2