diff --git a/gui/action.cpp b/gui/action.cpp
index 8f85e16..f7f29e8 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -1874,9 +1874,8 @@
 {
 	operation_start("Set Boot Slot");
 	if (!simulate)
-	{
 		PartitionManager.Set_Active_Slot(arg);
-	} else
+	else
 		simulate_progress_bar();
 	operation_end(0);
 	return 0;
diff --git a/partition.cpp b/partition.cpp
index 9ff9061..626c612 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -2331,7 +2331,7 @@
 			goto exit;
 		}
 		backedup_size += (unsigned long long)(bs);
-		Remain = Remain - (unsigned long long)(bs);
+		Remain -= (unsigned long long)(bs);
 		if (part_settings->progress)
 			part_settings->progress->UpdateSize(backedup_size);
 		if (PartitionManager.Check_Backup_Cancel() != 0)
@@ -2398,9 +2398,9 @@
 		}
 	}
 
-	string Full_FileName, Restore_File_System = Get_Restore_File_System(part_settings);
+	string Full_FileName = part_settings->Backup_Folder + "/" + Backup_FileName;
+	string Restore_File_System = Get_Restore_File_System(part_settings);
 
-	Full_FileName = part_settings->Backup_Folder + "/" + Backup_FileName;
 	if (Is_Image(Restore_File_System)) {
 		Restore_Size = TWFunc::Get_File_Size(Full_FileName);
 		return Restore_Size;
diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index ffa43ee..8f67897 100644
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -362,8 +362,7 @@
 		printf("   Format_Block_Size: %lu\n", Part->Format_Block_Size);
 	if (!Part->MTD_Name.empty())
 		printf("   MTD_Name: %s\n", Part->MTD_Name.c_str());
-	string back_meth = Part->Backup_Method_By_Name();
-	printf("   Backup_Method: %s\n", back_meth.c_str());
+	printf("   Backup_Method: %s\n", Part->Backup_Method_By_Name().c_str());
 	if (Part->Mount_Flags || !Part->Mount_Options.empty())
 		printf("   Mount_Options: %s\n", Part->Mount_Options.c_str());
 	if (Part->MTP_Storage_ID)
@@ -584,9 +583,8 @@
 
 	if (part_settings->Part->Backup(part_settings, &tar_fork_pid)) {
 		bool md5Success = false;
-		if (part_settings->adbbackup) {
+		if (part_settings->adbbackup)
 			md5Success = true;
-		}
 		else
 			md5Success = Make_MD5(part_settings);