Cleanup filenames and use of EOL removal.