Cleaning and fixing

The line endings will be the end of me.