diff --git a/src/art/vector/Penis.tw b/src/art/vector/Penis.tw
index 9593524f54939d86fc4e16b62e492eceb4858031..af77f6d3c2cdff3d522d7bd82a5d508ea700d3f3 100644
--- a/src/art/vector/Penis.tw
+++ b/src/art/vector/Penis.tw
@@ -2,40 +2,30 @@
 
 /* BEWARE: _art_have_boobs and _art_scale_factor interfere with Art_Vector_Boob_ */
 
+<<set _penisSize = -1>>
  /* BULGE OUTFITS LONG+MEDIUM OUTFITS */
 <<if _artSlave.clothes == "a slave gown" || _artSlave.clothes == "a hijab and abaya" || _artSlave.clothes == "a nice maid outfit" || _artSlave.clothes == "a military uniform" || _artSlave.clothes == "a nice nurse outfit" || _artSlave.clothes == "a ball gown" || _artSlave.clothes == "battledress" || _artSlave.clothes == "nice business attire" || _artSlave.clothes == "conservative clothing" || _artSlave.clothes == "a kimono" || _artSlave.clothes == "a maternity dress" || _artSlave.clothes == "stretch pants and a crop-top" || _artSlave.clothes == "a toga" || _artSlave.clothes == "clubslut netting" || _artSlave.clothes == "a halter top dress" || _artSlave.clothes == "a slutty nurse outfit" || _artSlave.clothes == "slutty business attire" || _artSlave.clothes == "spats and a tank top">>
 	<<if _artSlave.dick >= 11>>
-		<<unset _penisSize = 10>>
 		<<include Art_Vector_Bulge_Outfit_10>>
 	<<elseif _artSlave.dick >= 10>>
-		<<unset _penisSize = 9>>
 		<<include Art_Vector_Bulge_Outfit_9>>
 	<<elseif _artSlave.dick >= 9>>
-		<<unset _penisSize = 8>>
 		<<include Art_Vector_Bulge_Outfit_8>>
 	<<elseif _artSlave.dick >= 8>>
-		<<unset _penisSize = 7>>
 		<<include Art_Vector_Bulge_Outfit_7>>
 	<<elseif _artSlave.dick >= 7>>
-		<<unset _penisSize = 6>>
 		<<include Art_Vector_Bulge_Outfit_6>>
 	<<elseif _artSlave.dick >= 6>>
-		<<unset _penisSize = 5>>
 		<<include Art_Vector_Bulge_Outfit_5>>
 	<<elseif _artSlave.dick >= 5>>
-		<<unset _penisSize = 4>>
 		<<include Art_Vector_Bulge_Outfit_4>>
 	<<elseif _artSlave.dick >= 4>>
-		<<unset _penisSize = 3>>
 		<<include Art_Vector_Bulge_Outfit_3>>
 	<<elseif _artSlave.dick >= 3>>
-		<<unset _penisSize = 2>>
 		<<include Art_Vector_Bulge_Outfit_2>>
 	<<elseif _artSlave.dick >= 2>>
-		<<unset _penisSize = 1>>
 		<<include Art_Vector_Bulge_Outfit_1>>
 	<<elseif _artSlave.dick >= 1>>
-		<<unset _penisSize = 0>>
 		<<include Art_Vector_Bulge_Outfit_0>>
 	<</if>>
 <</if>>
@@ -43,16 +33,12 @@
 /* BULGE OUTFITS SHORT OUTFITS */
 <<if _artSlave.clothes == "cutoffs and a t-shirt" || _artSlave.clothes == "a leotard" || _artSlave.clothes == "a slutty maid outfit" || _artSlave.clothes == "a mini dress" || _artSlave.clothes == "a scalemail bikini" || _artSlave.clothes == "a slutty outfit" || _artSlave.clothes == "a succubus outfit" || _artSlave.clothes == "attractive lingerie for a pregnant woman" || _artSlave.clothes == "a bunny outfit" || _artSlave.clothes == "a chattel habit" || _artSlave.clothes == "harem gauze" || _artSlave.clothes == "a huipil" || _artSlave.clothes == "a slutty qipao" || _artSlave.clothes == "a penitent nuns habit">>
 	<<if _artSlave.dick >= 4>>
-		<<unset _penisSize = 3>>
 		<<include Art_Vector_Bulge_Outfit_3>>
 	<<elseif _artSlave.dick >= 3>>
-		<<unset _penisSize = 2>>
 		<<include Art_Vector_Bulge_Outfit_2>>
 	<<elseif _artSlave.dick >= 2>>
-		<<unset _penisSize = 1>>
 		<<include Art_Vector_Bulge_Outfit_1>>
 	<<elseif _artSlave.dick >= 1>>
-		<<unset _penisSize = 0>>
 		<<include Art_Vector_Bulge_Outfit_0>>
 	<</if>>
 <</if>>
@@ -80,8 +66,6 @@
 	  <<set _penisSize = 1>>
 	<<elseif _artSlave.dick >= 1>>
 	  <<set _penisSize = 0>>
-	<<else>>
-	  <<set _penisSize = -1>>
 	<</if>>
 <</if>>
 
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index f71d93b65ff9f1c1073335eb482c7374e933e670..9b92f7e0ea2abae12957b43eb6d34ddca8e758df 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -237,9 +237,9 @@
 %/
 	<<default>> /* WALKPASTS START HERE */
 
-		<<if ($activeSlave.heels == 1) && ($activeSlave.shoes !== "flats") && ($activeSlave.shoes !==  "flats with short stockings") && ($activeSlave.shoes !== "flats with long stockings") && ($activeSlave.shoes !== "none")>>
+		<<if (_partnerSlave.heels == 1) && !["flats", "flats with short stockings", "flats with long stockings", "none"].includes(_partnerSlave.shoes)>>
 			walks past your desk with the tiny swaying steps she must take in order to walk on her surgically altered legs. She is on her way to
-		<<elseif ($activeSlave.shoes == "heels") && ($activeSlave.shoes !== "heels with short stockings") && ($activeSlave.shoes !== "heels with long stockings") && ($activeSlave.shoes !== "pumps") && ($activeSlave.shoes !== "pumps with short stockings") && ($activeSlave.shoes !== "pumps with long stockings")>>
+		<<elseif ["heels", "heels with short stockings", "heels with long stockings", "pumps", "pumps with short stockings", "pumps with long stockings"].includes(_partnerSlave.shoes)>>
 			walks past your desk with the swaying steps she must take in her high heels. She is on her way to
 		<<elseif ($activeSlave.shoes == "boots")>>
 			walks past your desk with the confident gait encouraged by her high heeled boots. She is on her way to