diff --git a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
index bb3ef8b630..aa2190e619 100644
--- a/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
+++ b/code/citadel/crew_objectives/cit_crewobjectives_cargo.dm
@@ -17,12 +17,12 @@
 /datum/objective/crew/quartermaster/petsplosion/check_completion()
 	var/petcount = target_amount
 	for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
-		if(!P.stat == DEAD)
-			if(P.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(P)])
+		if!(P.stat == DEAD)
+			if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)])
 				petcount--
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(!H.stat == DEAD)
-			if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
+		if!(H.stat == DEAD)
+			if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
 				if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
 					petcount--
 	if(petcount <= 0)
@@ -47,12 +47,12 @@
 /datum/objective/crew/cargotechnician/petsplosion/check_completion()
 	var/petcount = target_amount
 	for(var/mob/living/simple_animal/pet/P in GLOB.mob_list)
-		if(!P.stat == DEAD)
-			if(P.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(P)])
+		if!(P.stat == DEAD)
+			if(P.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(P)])
 				petcount--
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(!H.stat == DEAD)
-			if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
+		if!(H.stat == DEAD)
+			if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
 				if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
 					petcount--
 	if(petcount <= 0)
@@ -67,6 +67,6 @@
 
 /datum/objective/crew/shaftminer/bubblegum/check_completion()
 	for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_list)
-		if(!B.stat == DEAD)
+		if!(B.stat == DEAD)
 			return FALSE
 	return TRUE
diff --git a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
index 500196bf98..69307ed7f7 100644
--- a/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
+++ b/code/citadel/crew_objectives/cit_crewobjectives_civilian.dm
@@ -68,7 +68,7 @@
 /datum/objective/crew/bartender/responsibility/check_completion()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
 		if(H.stat == DEAD && H.drunkenness >= 80)
-			if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
+			if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
 				return FALSE
 	return TRUE
 
@@ -76,13 +76,13 @@
 
 /datum/objective/crew/janitor/clean //ported from old Hippie
 	var/list/areas = list()
-	var/hardmode = 0
+	var/hardmode = FALSE
 	explanation_text = "Ensure sure that (Yo, something broke. Yell about this in citadels devlopmeent discussion channel.) remain spotless at the end of the shift."
 
 /datum/objective/crew/janitor/clean/New()
 	. = ..()
 	if(prob(1))
-		hardmode = 1
+		hardmode = TRUE
 	var/list/blacklistnormal = list(typesof(/area/space) - typesof(/area/lavaland) - typesof(/area/mine) - typesof(/area/ai_monitored/turret_protected) - typesof(/area/tcommsat))
 	var/list/blacklisthard = list(typesof(/area/lavaland) - typesof(/area/mine))
 	var/list/possibleareas = list()
diff --git a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm
index ec4228cc27..4147884b09 100644
--- a/code/citadel/crew_objectives/cit_crewobjectives_medical.dm
+++ b/code/citadel/crew_objectives/cit_crewobjectives_medical.dm
@@ -7,7 +7,7 @@
 
 /datum/objective/crew/chiefmedicalofficer/morgue/check_completion()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(H.stat == DEAD && H.z == ZLEVEL_STATION)
+		if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
 			if(get_area(H) != /area/medical/morgue)
 				return FALSE
 	return TRUE
@@ -46,7 +46,7 @@
 
 /datum/objective/crew/geneticist/morgue/check_completion()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(H.stat == DEAD && H.z == ZLEVEL_STATION)
+		if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
 			if(get_area(H) != /area/medical/morgue)
 				return FALSE
 	return TRUE
@@ -119,7 +119,7 @@
 /datum/objective/crew/virologist/noinfections/check_completion()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
 		if(!H.stat == DEAD)
-			if(H.z == ZLEVEL_STATION || SSshuttle.emergency.shuttle_areas[get_area(H)])
+			if(H.z == ZLEVEL_STATION_PRIMARY || SSshuttle.emergency.shuttle_areas[get_area(H)])
 				if(H.check_virus() == 2)
 					return FALSE
 	return TRUE
@@ -131,7 +131,7 @@
 
 /datum/objective/crew/medicaldoctor/morgue/check_completion()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(H.stat == DEAD && H.z == ZLEVEL_STATION)
+		if(H.stat == DEAD && H.z == ZLEVEL_STATION_PRIMARY)
 			if(get_area(H) != /area/medical/morgue)
 				return FALSE
 	return TRUE