Improve regex.