improving regular expression