Fixed a regex and added whitespace