diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 5d20fb579c74a63ff95af3f9d648bf8b4b78a9d7..da99a03fbfe304830b04f914684c85d17c432743 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1249,49 +1249,48 @@ window.corpValue = function() {
 	const V = State.variables;
 	if (V.corpIncorporated === 0) {
 		return 0;
-	} else {
-		let corpAssets = 0;
-		if (V.corpDivExtra > 0) {
-			corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
-		}
-		if (V.corpDivLegal > 0) {
-			corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
-		}
-		if (V.corpDivBreak > 0) {
-			corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
-		}
-		if (V.corpDivSurgery > 0) {
-			corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
-		}
-		if (V.corpDivTrain > 0) {
-			if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
-				corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
-			} else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
-				corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
-			} else {
-				corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
-			}
-		}
-		if (V.corpDivArcade > 0) {
-			corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
-		}
-		if (V.corpDivMenial > 0) {
-			corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
-		}
-		if (V.corpDivDairy > 0) {
-			corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+	}
+	let corpAssets = 0;
+	if (V.corpDivExtra > 0) {
+		corpAssets += V.corpDivExtraDev * 16000 + V.corpDivExtraSlaves * 10000;
+	}
+	if (V.corpDivLegal > 0) {
+		corpAssets += V.corpDivLegalDev * 20000 + V.corpDivLegalSlaves * 15000;
+	}
+	if (V.corpDivBreak > 0) {
+		corpAssets += V.corpDivBreakDev * 7200 + V.corpDivBreakSlaves * 10000 + V.corpDivBreakSlaves2 * 15000;
+	}
+	if (V.corpDivSurgery > 0) {
+		corpAssets += V.corpDivSurgeryDev * 16000 + V.corpDivSurgerySlaves * 15000 + V.corpDivSurgerySlaves2 * 23000;
+	}
+	if (V.corpDivTrain > 0) {
+		if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+			corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 15000 + V.corpDivTrainSlaves2 * 26000;
+		} else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 5) {
+			corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * (15000 + 1600 * V.corpDivTrainSurgeryTimer) + V.corpDivTrainSlaves2 * (26000 + 1600 * V.corpDivTrainSurgeryTimer);
+		} else {
+			corpAssets += V.corpDivTrainDev * 20000 + V.corpDivTrainSlaves * 23000 + V.corpDivTrainSlaves2 * 34000;
 		}
-		if (V.corpDivWhore > 0) {
-			if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
-				corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
-			} else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
-				corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
-			} else {
-				corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
-			}
+	}
+	if (V.corpDivArcade > 0) {
+		corpAssets += V.corpDivArcadeDev * 4000 + V.corpDivArcadeSlaves * 10000;
+	}
+	if (V.corpDivMenial > 0) {
+		corpAssets += V.corpDivMenialDev * 5200 + V.corpDivMenialSlaves * 15000;
+	}
+	if (V.corpDivDairy > 0) {
+		corpAssets += V.corpDivDairyDev * 12000 + V.corpDivDairySlaves * 23000;
+	}
+	if (V.corpDivWhore > 0) {
+		if (V.corpDivSurgery + V.corpDivTrain < 2 && V.corpDivTrainSurgerySwitch === 0) {
+			corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 26000;
+		} else if (V.corpDivTrainSurgerySwitch === 1 && V.corpDivTrainSurgeryTimer < 20) {
+			corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * (26000 + 400 * V.corpDivTrainSurgeryTimer);
+		} else {
+			corpAssets += V.corpDivWhoreDev * 16000 + V.corpDivWhoreSlaves * 34000;
 		}
-		return corpAssets + V.corpDividend + V.corpCash;
 	}
+	return corpAssets + V.corpDividend + V.corpCash;
 };
 
 // Corporation Share Price
@@ -1301,9 +1300,8 @@ window.corpSharePrice = function(q = 0) {
 	const V = State.variables;
 	if (V.corpIncorporated === 0) {
 		return 0;
-	} else {
-		return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
 	}
+	return Math.trunc(1000 * (corpValue() / (V.personalShares + V.publicShares + q)));
 };
 
 // Corporation Division Slave room
@@ -1314,63 +1312,56 @@ window.corpDivBreakSlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivBreak === 1 && V.corpDivBreakDev > V.corpDivBreakSlaves) {
 		return V.corpDivBreakDev - V.corpDivBreakSlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivSurgerySlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivSurgery === 1 && V.corpDivSurgeryDev > V.corpDivSurgerySlaves) {
 		return V.corpDivSurgeryDev - V.corpDivSurgerySlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivTrainSlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivTrain === 1 && V.corpDivTrainDev > V.corpDivTrainSlaves) {
 		return V.corpDivTrainDev - V.corpDivTrainSlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivArcadeSlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivArcade === 1 && V.corpDivArcadeDev > V.corpDivArcadeSlaves) {
 		return V.corpDivArcadeDev - V.corpDivArcadeSlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivMenialSlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivMenial === 1 && V.corpDivMenialDev > V.corpDivMenialSlaves) {
 		return V.corpDivMenialDev - V.corpDivMenialSlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivDairySlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivDairy === 1 && V.corpDivDairyDev > V.corpDivDairySlaves) {
 		return V.corpDivDairyDev - V.corpDivDairySlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 window.corpDivWhoreSlavesRoom = function() {
 	const V = State.variables;
 	if (V.corpDivWhore === 1 && V.corpDivWhoreDev > V.corpDivWhoreSlaves) {
 		return V.corpDivWhoreDev - V.corpDivWhoreSlaves;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 //Corporation race blacklisting/whitelisting
@@ -1403,15 +1394,15 @@ window.getSlaveStatisticData = function(s, facility) {
 
 	if (facility.income.has(s.ID)) {
 		return facility.income.get(s.ID);
-	} else {
-		const data = {
-			ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
-			income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
-			customers: 0 /* brothel, club, ... */
-		};
-		facility.income.set(s.ID, data);
-		return data;
 	}
+
+	const data = {
+		ID: s.ID, slaveName: s.slaveName, customLabel: s.custom.label,
+		income: 0, adsIncome: 0, rep: 0, food: 0, cost: getSlaveCost(s),
+		customers: 0 /* brothel, club, ... */
+	};
+	facility.income.set(s.ID, data);
+	return data;
 };
 
 window.initFacilityStatistics = function(facility) {