Convert files to UTF-8 and some cleanups