Make sure we properly handle carriage returns in a strings
Whitespace fixes