Improved regex to handle spaces after commas