Fix whitespace regex to catch carriage returns