Fixed some of the spacing issues in the new regex.