diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm
index ff83a3764c..f9ef1ad6d4 100644
--- a/code/game/gamemodes/brother/traitor_bro.dm
+++ b/code/game/gamemodes/brother/traitor_bro.dm
@@ -1,6 +1,6 @@
 /datum/objective_team/brother_team
-	name = "brotherhood" 
-	member_name = "blood brother" 
+	name = "brotherhood"
+	member_name = "blood brother"
 	var/list/objectives = list()
 	var/meeting_area
 
@@ -71,7 +71,7 @@
 		num_teams = max(1, round(num_players() / bsc))
 
 	for(var/j = 1 to num_teams)
-		if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies) 
+		if(possible_brothers.len < min_team_size || antag_candidates.len <= required_enemies)
 			break
 		var/datum/objective_team/brother_team/team = new
 		var/team_size = prob(10) ? min(3, possible_brothers.len) : 2
@@ -113,12 +113,13 @@
 		var/objective_count = 1
 		for(var/datum/objective/objective in team.objectives)
 			if(objective.check_completion())
-				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
+				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
 				SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
 			else
-				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
 				SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
-				win = FALSE
+				if(!(istype(objective, /datum/objective/crew)))
+					win = FALSE
 			objective_count++
 		if(win)
 			text += "<br><font color='green'><B>The blood brothers were successful!</B></font>"
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index e84477b2cb..8389f04fd3 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -113,20 +113,13 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 			if(changeling.objectives.len)
 				var/count = 1
 				for(var/datum/objective/objective in changeling.objectives)
-					if(istype(objective, /datum/objective/crew))
-						if(objective.check_completion())
-							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
-						else
-							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+					if(objective.check_completion())
+						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
+						SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
 					else
-						if(objective.check_completion())
-							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
-						else
-							text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span>"
-							SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
+						SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+						if(!(istype(objective, /datum/objective/crew)))
 							changelingwin = 0
 					count++
 
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index a97e5a924b..a4229942c5 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -113,17 +113,14 @@
 			if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
 				var/count = 1
 				for(var/datum/objective/objective in traitor.objectives)
-					if(istype(objective, /datum/objective/crew))
-						if(objective.check_completion())
-							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
-						else
-							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
-							SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
+					if(objective.check_completion())
+						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
+						SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
 					else
-						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
+						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
 						SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
-						traitorwin = FALSE
+						if(!(istype(objective, /datum/objective/crew)))
+							traitorwin = FALSE
 					count++
 
 			if(uplink_true)
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 304f80b470..93fa409f7e 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -47,7 +47,7 @@
 	for(var/datum/mind/wizard in wizards)
 		if(isliving(wizard.current) && wizard.current.stat!=DEAD)
 			return FALSE
-	
+
 	for(var/obj/item/phylactery/P in GLOB.poi_list) //TODO : IsProperlyDead()
 		if(P.mind && P.mind.has_antag_datum(/datum/antagonist/wizard))
 			return FALSE
@@ -55,7 +55,7 @@
 	if(SSevents.wizardmode) //If summon events was active, turn it off
 		SSevents.toggleWizardmode()
 		SSevents.resetFrequency()
-	
+
 	return TRUE
 
 /datum/game_mode/wizard/declare_completion()
@@ -89,20 +89,13 @@
 			var/count = 1
 			var/wizardwin = 1
 			for(var/datum/objective/objective in wizard.objectives)
-				if(istype(objective, /datum/objective/crew))
-					if(objective.check_completion())
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> <font color='grey'>(Optional)</font>"
-						SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
-					else
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
-						SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
+				if(objective.check_completion())
+					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
+					SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
 				else
-					if(objective.check_completion())
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
-						SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
-					else
-						text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
-						SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
+					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
+					SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
+					if(!(istype(objective, /datum/objective/crew)))
 						wizardwin = 0
 				count++