Cleanup and adding Windows line endings support.