Cleaned regex slightly