diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 6f7227f046fb5f09859dbf29f1f01c3ef548dea5..247c482d7f7a73d29b74fef0f0d629bdcf5eb271 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -5,7 +5,7 @@
 window.saNanny = function saNanny(slave) {
 	"use strict";
 	const V = State.variables;
-	/* eslint-disable */
+	/* eslint-disable no-unused*/
 	const pronouns = getPronouns(slave);
 	const he = pronouns.pronoun;
 	const him = pronouns.object;
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 009befc9e6b397d3426d5f13dc73ae0136b75b50..61fab787504819fb54af457c30829038c277e640 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -4,7 +4,7 @@
  */
 window.saRest = function saRest(slave) {
 	const V = State.variables;
-	/* eslint-disable */
+	/* eslint-disable no-unused*/
 	const pronouns = getPronouns(slave);
 	const he = pronouns.pronoun;
 	const him = pronouns.object;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 7125a95b18c2258d193979513773d0a1421410e8..c40010c37fe4ba97e3ddd1d6a04b98db27cba6dc 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -4,7 +4,7 @@
  */
 window.saServant = function saServant(slave) {
 	const V = State.variables;
-	/* eslint-disable */
+	/* eslint-disable no-unused*/
 	const pronouns = getPronouns(slave);
 	const he = pronouns.pronoun;
 	const him = pronouns.object;
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 2c54aa55d6c0a8f9718dcac2eabec0e9da5dadfb..26d7436a7420d0b897e8c97ef14a20d454f21b84 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -29,7 +29,8 @@ window.saServeThePublic = (function saServeThePublic() {
 		r = ` `;
 		pronouns = getPronouns(slave);
 		he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, girl = pronouns.noun;
-		He = capFirstChar(he), His = capFirstChar(his);
+		He = capFirstChar(he);
+		His = capFirstChar(his);
 		girl === "girl" ? loli = "loli" : loli = "shota";
 
 		gatherStatistics(slave);
@@ -769,16 +770,7 @@ window.saServeThePublic = (function saServeThePublic() {
 						r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
 					}
 				} else if (arcology.FSPhysicalIdealist !== "unset") { // no muscle malus for muscle loving societies
-					if (arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) { // reduced weight malus for fat loving societies
-						if (arcology.FSSlimnessEnthusiast > 20) {
-							r += ` The public enjoys ${his} fashionably sleek little body.`;
-						} else {
-							r += ` The public enjoys ${his} sleek, girlish figure.`;
-						}
-						if (canTalk(slave) && slave.voice > 2) {
-							r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
-						}
-					} else if (slave.weight <= 10) {
+					if ((arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) || slave.weight <= 10) { // reduced weight malus for fat loving societies
 						if (arcology.FSSlimnessEnthusiast > 20) {
 							r += ` The public enjoys ${his} fashionably sleek little body.`;
 						} else {
@@ -789,16 +781,7 @@ window.saServeThePublic = (function saServeThePublic() {
 						}
 					}
 				} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
-					if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
-						if (arcology.FSSlimnessEnthusiast > 20) {
-							r += ` The public enjoys ${his} fashionably sleek little body.`;
-						} else {
-							r += ` The public enjoys ${his} sleek, girlish figure.`;
-						}
-						if (canTalk(slave) && slave.voice > 2) {
-							r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
-						}
-					} else if (slave.muscles <= 30) {
+					if (arcology.FSHedonisticDecadenceStrongFat === 1 || slave.muscles <= 30) { // no muscle malus for muscle loving societies
 						if (arcology.FSSlimnessEnthusiast > 20) {
 							r += ` The public enjoys ${his} fashionably sleek little body.`;
 						} else {