Unix line breaks, and a little refactoring.