Switched to LF vs CRLF line breaks, and code formatting changes