Minor simplification to regex