Improved the RegEx