Improve regexp.