code cleaning to prevent warnings some changes in saving set filenames