Remove non-unix line breaks
Remove C++11 'auto' specifier for portability