Small redundancy changes to conf/save file handling