diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 332686f7c51da9602b1f181517221ba1a92d0699..8186e8b444608f61a79fa27de5632ad175f81db2 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -473,10 +473,11 @@ window.removeJob = function removeJob(slave, assignment) {
 				if (V.HGSuiteEquality === 0 && V.personalAttention === "HG") {
 					if (V.PC.career === "escort") {
 						V.personalAttention = "whoring";
-				} else if (V.PC.career === "servant") {
-					V.personalAttention = "upkeep";
-				} else { V.personalAttention = "business"; }
-
+					} else if (V.PC.career === "servant") {
+						V.personalAttention = "upkeep";
+					} else {
+						V.personalAttention = "business";
+					}
 					r += `You no longer have a slave assigned to be your Head Girl, so you turn your personal attention to focus on ${V.personalAttention}.`;
 				}
 				break;
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index a44b9280433cd4accef6478d9609649915547767..0f956cd8966c7d86f64896f165a74d5e61f715a4 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1632,8 +1632,18 @@ window.FResult = (function () {
 		if (slave.attrKnown === 1) {
 			result += Math.trunc(slave.attrXX / 20);
 			result += Math.trunc(slave.attrXY / 20);
-			if (slave.energy > 95) { result += 3; } else if (slave.energy > 80) { result += 2; } else if (slave.energy > 60) { result += 1; } else if (slave.energy <= 20) { result -= 2; } else if (slave.energy <= 40) { result -= 1; }
-		}
+			if (slave.energy > 95) {
+				result += 3;
+			} else if (slave.energy > 80) {
+				result += 2;
+			} else if (slave.energy > 60) {
+				result += 1;
+			} else if (slave.energy <= 20) {
+				result -= 2;
+			} else if (slave.energy <= 40) {
+				result -= 1;
+			}
+			}
 		if (slave.sexualFlaw !== "none") { result -= 2; }
 		if (slave.sexualQuirk !== "none") { result += 2; }
 		if (slave.behavioralFlaw !== "none") { result -= 2; }
@@ -1655,7 +1665,9 @@ window.FResult = (function () {
 	 * @param {App.Entity.SlaveState} slave
 	 */
 	function calcSight(slave) {
-		if (!canSee(slave)) { result -= 3; } else if (slave.eyes <= -1) {
+		if (!canSee(slave)) {
+			result -= 3;
+		} else if (slave.eyes <= -1) {
 			if (slave.eyewear !== "corrective glasses" && slave.eyewear !== "corrective contacts") {
 				result -= 1;
 			}
@@ -1745,19 +1757,27 @@ window.FResult = (function () {
 	 */
 	function calcAge(slave) {
 		if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
-			result += 1;
-			if (slave.birthWeek === 0) { result += result; } else if (slave.birthWeek < 4) { result += 0.2 * result; }
-		} else if (slave.physicalAge === V.minimumSlaveAge) {
-			result += 1;
-			if (slave.birthWeek === 0) { result += 0.5 * result; } else if (slave.birthWeek < 4) { result += 0.1 * result; }
-		} else if (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset")) {
 			result += 1;
 			if (slave.birthWeek === 0) {
-				result += 0.5 * result;
+				result += result;
 			} else if (slave.birthWeek < 4) {
-				result += 0.1 * result;
+				result += 0.2 * result;
+			}
+			} else if (slave.physicalAge === V.minimumSlaveAge) {
+				result += 1;
+				if (slave.birthWeek === 0) {
+					result += 0.5 * result;
+				} else if (slave.birthWeek < 4) {
+					result += 0.1 * result;
+				}
+			} else if (slave.physicalAge === V.fertilityAge && canGetPregnant(slave) && (V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset")) {
+				result += 1;
+				if (slave.birthWeek === 0) {
+					result += 0.5 * result;
+				} else if (slave.birthWeek < 4) {
+					result += 0.1 * result;
+				}
 			}
-		}
 	}
 
 	/**