Tighten regex