Fix order of this to be consistent.
Fix line endings.