diff --git a/code/game/objects/effects/effect_system/particle_effects.dm b/code/game/objects/effects/effect_system/particle_effects.dm
index 972d242bf359..9440c16f2d4e 100644
--- a/code/game/objects/effects/effect_system/particle_effects.dm
+++ b/code/game/objects/effects/effect_system/particle_effects.dm
@@ -8,10 +8,10 @@
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	unacidable = TRUE // So effect are not targeted by alien acid.
 
-/obj/effect/particle_effect/initialize_pass_flags(datum/pass_flags_container/PF)
+/obj/effect/particle_effect/initialize_pass_flags(datum/pass_flags_container/pass_flags)
 	..()
-	if (PF)
-		PF.flags_pass = PASS_OVER|PASS_AROUND|PASS_UNDER|PASS_THROUGH|PASS_MOB_THRU
+	if (pass_flags)
+		pass_flags.flags_pass = PASS_OVER|PASS_AROUND|PASS_UNDER|PASS_THROUGH|PASS_MOB_THRU
 
 //Water
 
@@ -22,17 +22,14 @@
 	var/life = 15
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
-/obj/effect/particle_effect/water/initialize_pass_flags(datum/pass_flags_container/PF)
+/obj/effect/particle_effect/water/initialize_pass_flags(datum/pass_flags_container/pass_flags)
 	..()
-	if (PF)
-		PF.flags_pass = PASS_THROUGH|PASS_OVER|PASS_MOB_THRU|PASS_UNDER
+	if (pass_flags)
+		pass_flags.flags_pass = PASS_THROUGH|PASS_OVER|PASS_MOB_THRU|PASS_UNDER
 
 /obj/effect/particle_effect/water/Move(turf/newloc)
-	//var/turf/T = src.loc
-	//if (istype(T, /turf))
-	// T.firelevel = 0 //TODO: FIX
-	if (--src.life < 1)
-		//SN src = null
+	life -= 1
+	if (life < 1)
 		qdel(src)
 	if(newloc.density)
 		return 0