improve regexp pattern