diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 48f0c1e2cd4738d6beba35b65d37c371a057a776..5bbce4a050ae02f511f8eb1cf51fca2b5d727b4e 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -171,7 +171,7 @@ window.assignJob = function assignJob(slave, job) {
 			slave.assignmentVisible = 0;
 			V.masterSuiteSlaves++;
 			V.MastSiIDs.push(slave.ID);
-			if(V.masterSuiteUpgradeLuxury > 0)
+			if (V.masterSuiteUpgradeLuxury > 0)
 				slave.livingRules = "luxurious";
 			else
 				slave.livingRules = "spare";
@@ -259,7 +259,7 @@ window.assignJob = function assignJob(slave, job) {
 		case "be your concubine":
 			slave.assignment = job;
 			slave.assignmentVisible = 0; /* non-visible leadership roles */
-			if(V.masterSuiteUpgradeLuxury > 0)
+			if (V.masterSuiteUpgradeLuxury > 0)
 				slave.livingRules = "luxurious";
 			else
 				slave.livingRules = "normal";
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 57b6e9ccebaf8d831ee4149929c84131e70af10b..1edb9708fd8882990bb8000f099b3981b251ee0d 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -146,7 +146,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
 				customTitle: "title",
 				customTitleLisp: "titleLisp",
 				customHairVector: "hairVector"
-			}
+			};
 
 			for (let prop in slave) {
 				if (nameMap.hasOwnProperty(prop)) {
@@ -771,7 +771,7 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
 		}
 		if (slave.custom.image !== null) {
 			if (typeof slave.custom.image.filename !== "string") {
-				slave.custom.image = null
+				slave.custom.image = null;
 			}
 		}
 	}
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index de9c109f11b68c44985aa4eb36c1357a5a19b92c..a44dd4c8ea5efeac41560bec0a4f105fb37de352 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -16,17 +16,15 @@ window.isParentP = function isParentP(daughter, parent) {
 window.sameDad = function (slave1, slave2) {
 	if ((slave1.father === slave2.father) && (slave1.father !== 0 && slave1.father !== -2)) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.sameMom = function (slave1, slave2) {
 	if ((slave1.mother === slave2.mother) && (slave1.mother !== 0 && slave1.mother !== -2)) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.isAunt = /** @param {App.Entity.SlaveState} niece, @param {App.Entity.SlaveState} aunt */ function (niece, aunt) {
@@ -58,9 +56,8 @@ window.sameTParent = function (slave1, slave2) {
 		return 2;
 	} else if ((slave1.mother === slave2.father || slave1.father === slave2.mother) && slave1.mother !== 0 && slave1.mother !== -2 && slave2.mother !== 0 && slave2.mother !== -2 && slave1.mother !== slave1.father) {
 		return 3;
-	} else {
-		return 0;
 	}
+	return 0;
 };
 
 /*
@@ -80,9 +77,8 @@ window.areTwins = function (slave1, slave2) {
 		return false;
 	} else if (slave1.actualAge === slave2.actualAge && slave1.birthWeek === slave2.birthWeek) {
 		return true;
-	} else {
-		return false;
 	}
+	return false;
 };
 
 window.areSisters = function (slave1, slave2) {
@@ -205,9 +201,8 @@ window.isSlaveAvailable = /** @param {App.Entity.SlaveState} slave */ function (
 		return false;
 	} else if (slave.assignment === "work in the dairy" && State.variables.dairyRestraintsSetting >= 2) {
 		return false;
-	} else {
-		return true;
 	}
+	return true;
 };
 
 /* OLD
@@ -312,7 +307,7 @@ window.totalPlayerRelatives = function (pc) {
 window.relativeTerm = /** @param {App.Entity.SlaveState} slave1 @param {App.Entity.SlaveState} slave2 */
 	function (slave1, slave2) {
 		if (slave2.mother === slave1.ID || slave2.father === slave1.ID) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "son";
 			} else {
 				return "daughter";
@@ -322,31 +317,31 @@ window.relativeTerm = /** @param {App.Entity.SlaveState} slave1 @param {App.Enti
 		} else if (slave1.father === slave2.ID) {
 			return "father";
 		} else if (areSisters(slave2, slave1) === 1) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "twin brother";
 			} else {
 				return "twin sister";
 			}
 		} else if (areSisters(slave2, slave1) === 2) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "brother";
 			} else {
 				return "sister";
 			}
 		} else if (areSisters(slave2, slave1) === 3) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "half-brother";
 			} else {
 				return "half-sister";
 			}
 		} else if (isAunt(slave1, slave2)) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "nephew";
 			} else {
 				return "niece";
 			}
 		} else if (isAunt(slave2, slave1)) {
-			if (slave2.genes === "XY" && State.variables.diversePronouns == 1) {
+			if (slave2.genes === "XY" && State.variables.diversePronouns === 1) {
 				return "uncle";
 			} else {
 				return "aunt";