Improved a regex.