fix cr and whitespace