simplify regexp a little