few improves to regex