Tightened up regex