Cleanup and fix to unix line endings