Fix cr and whitespace