Improve the regex