improve regular expression