diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index 70a831e23d00f44afe17047df1703d0f61bef00d..682f9b9c50cfab76016516595779bca380b4291c 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -12,11 +12,12 @@ App.UI.bodyModification = function(slave, cheat = false) {
 	} = getPronouns(slave);
 	Enunciate(slave);
 	let piercingLevel;
-	let modReaction;
-	let scarApplied;
-	let tattooChoice;
-	let brandApplied;
-	let degradation;
+	let modReaction = "";
+	/** @type {string|0} */
+	let tattooChoice = "";
+	let scarApplied = false;
+	let brandApplied = false;
+	let degradation = 0;
 
 	container.append(createPage());
 	return container;
@@ -187,9 +188,9 @@ App.UI.bodyModification = function(slave, cheat = false) {
 				}
 				if (modReaction) {
 					r.push(modReaction);
-					modReaction = false;
 				}
 			}
+			modReaction = "";
 		}
 		App.Events.addNode(el, r, "p");
 		return el;
@@ -282,7 +283,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
 				App.UI.DOM.link(
 					"Entire body",
 					() => {
-						modReaction = "";
 						for (const location of validPiercingLocations) {
 							if (slave[`${location}Piercing`] !== piercingLevel) {
 								modReaction += App.Medicine.Modification.setPiercing(slave, location, piercingLevel);
@@ -303,8 +303,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 						App.UI.DOM.link(
 							capFirstChar(location),
 							() => {
-								modReaction = "";
-								modReaction += App.Medicine.Modification.setPiercing(slave, location, piercingLevel);
+								modReaction = App.Medicine.Modification.setPiercing(slave, location, piercingLevel);
 								if (piercingLevel > 1) {
 									degradation += 1;
 								}
@@ -472,7 +471,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
 				App.UI.DOM.link(
 					"Entire body",
 					() => {
-						modReaction = "";
 						for (const location of validTattooLocations) {
 							if (slave[`${location}tattoo`] !== tattooChoice) {
 								applyTat(location);
@@ -490,7 +488,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
 					App.UI.DOM.link(
 						capFirstChar(location),
 						() => {
-							modReaction = "";
 							applyTat(location);
 							refresh();
 						}
@@ -527,47 +524,45 @@ App.UI.bodyModification = function(slave, cheat = false) {
 
 		function oddTattoos() {
 			const el = new DocumentFragment();
-			let linkArray;
+			let linkArray = [];
 			let r = [];
+
+			// Has tat, display option to remove
+			if (slave.bellyTat !== 0) {
+				r.push(`${His} navel is tattooed with ${slave.bellyTat}.`);
+				linkArray.push(
+					App.UI.DOM.link(
+						"Remove tattoos",
+						() => {
+							tattooChoice = 0;
+							modReaction += App.Medicine.Modification.setTattoo(slave, "belly", tattooChoice);
+							refresh();
+						}
+					)
+				);
+			}
+
 			if (slave.belly >= 10000 && slave.bellyPreg < 450000 && slave.bellyFluid < 5000) {
-				if (slave.bellyTat === 0) {
-					r.push(`${He} has no navel tattoos.`);
-				} else {
-					r.push(`${His} navel is tattooed with ${slave.bellyTat}.`);
-				}
 				if (slave.bellyTat === 0) {
 					const bellyTats = new Map([
 						["Heart", "a heart"],
 						["Star", "a star"],
 						["Butterfly", "a butterfly"],
 					]);
-					linkArray = [];
+					r.push(`${He} has no navel tattoos.`);
 					for (const [title, value] of bellyTats) {
 						linkArray.push(
 							App.UI.DOM.link(
 								title,
 								() => {
 									tattooChoice = value;
-									applyTat("belly");
+									modReaction += App.Medicine.Modification.setTattoo(slave, "belly", tattooChoice);
 									refresh();
 								}
 							)
 						);
 					}
 				}
-				if (slave.bellyTat !== 0) {
-					linkArray.push(
-						App.UI.DOM.link(
-							"Remove tattoos",
-							() => {
-								tattooChoice = 0;
-								applyTat("belly");
-								refresh();
-							}
-						)
-					);
-				}
-				r.push(App.UI.DOM.generateLinksStrip(linkArray));
 			} else if (slave.bellyPreg >= 450000) {
 				r.push(`${His} middle is large and taut enough to be a suitable canvas for a navel focused tattoo, but ${his} brood is too active to permit the needle to do its work.`);
 			} else if (slave.bellyFluid >= 10000) {
@@ -575,6 +570,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 			} else {
 				r.push(`${His} middle isn't large enough to be a suitable canvas for a navel focused tattoo.`);
 			}
+			r.push(App.UI.DOM.generateLinksStrip(linkArray));
 			App.Events.addNode(el, r, "div");
 
 			r = [];
@@ -794,7 +790,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 				App.UI.DOM.link(
 					"Remove Scar",
 					() => {
-						scarApplied = 0;
+						scarApplied = false;
 						delete slave.scar[_scarName];
 						billSurgery();
 						degradation -= 10;
@@ -957,7 +953,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 						"left",
 						() => {
 							V.scarTarget.local = _leftTarget;
-							scarApplied = 1;
+							scarApplied = true;
 							App.Medicine.Modification.addScar(slave, _leftTarget, V.scarDesign.local);
 							billMod();
 							degradation += 10;
@@ -979,7 +975,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 						"right",
 						() => {
 							V.scarTarget.local = _rightTarget;
-							scarApplied = 1;
+							scarApplied = true;
 							App.Medicine.Modification.addScar(slave, _rightTarget, V.scarDesign.local);
 							billSurgery();
 							degradation += 10;
@@ -1036,7 +1032,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
 							}
 						}
 						billMod();
-						scarApplied = 1;
+						scarApplied = true;
 						degradation += 10;
 						refresh();
 					}
@@ -1053,10 +1049,6 @@ App.UI.bodyModification = function(slave, cheat = false) {
 		const el = new DocumentFragment();
 		let p = document.createElement('p');
 		let div = document.createElement('div');
-		const {
-			him, He,
-			his, His
-		} = getPronouns(slave);
 
 		App.UI.DOM.appendNewElement("h2", el, "Branding");