Tighten up regex a bit