Update for regex to ignore spaces, hyphens, commas