String cleanup, file renaming