improve the regex