String and arrays cleanup, file renaming