diff --git a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js
index 186861aa9b5fda008e21ce435cb40a4ec17bc156..b2fcabbea86d509fdb0efefedfdc056abd092574 100644
--- a/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js
+++ b/src/events/intro/customizeSlaveTrade/customizeSlaveTrade.js
@@ -50,8 +50,7 @@ App.UI.CustomSlaveTrade = function() {
 		div = document.createElement("div");
 		App.UI.DOM.appendNewElement("span", div, `Filter by Race: `);
 		array = [];
-		for (let i = 0; i < setup.filterRaces.length; i++) {
-			const race = setup.filterRaces[i];
+		for (const race of setup.filterRaces) {
 			if (baseControlsFilter === uncapFirstChar(race).replace(/[ -]/g, '')) {
 				array.push(
 					App.UI.DOM.disabledLink(
@@ -64,7 +63,7 @@ App.UI.CustomSlaveTrade = function() {
 					App.UI.DOM.link(
 						race,
 						() => {
-							baseControlsFilter = uncapFirstChar(setup.filterRaces[i]).replace(/[ -]/g, '');
+							baseControlsFilter = uncapFirstChar(race).replace(/[ -]/g, '');
 							refresh();
 						}
 					)
@@ -77,8 +76,7 @@ App.UI.CustomSlaveTrade = function() {
 		div = document.createElement("div");
 		App.UI.DOM.appendNewElement("span", div, `Filter by Region: `);
 		array = [];
-		for (let i = 0; i < setup.filterRegions.length; i++) {
-			const region = setup.filterRegions[i];
+		for (const region of setup.filterRegions) {
 			if (baseControlsFilter === uncapFirstChar(region).replace(/[ -]/g, '')) {
 				array.push(
 					App.UI.DOM.disabledLink(
@@ -91,7 +89,7 @@ App.UI.CustomSlaveTrade = function() {
 					App.UI.DOM.link(
 						region,
 						() => {
-							baseControlsFilter = uncapFirstChar(setup.filterRegions[i]).replace(/[ -]/g, '');
+							baseControlsFilter = uncapFirstChar(region).replace(/[ -]/g, '');
 							refresh();
 						}
 					)
@@ -111,8 +109,7 @@ App.UI.CustomSlaveTrade = function() {
 		list = document.createElement("UL");
 		list.classList.add("customize-slave-trade-ul");
 		if (baseControlsFilter === "all") {
-			for (let i = 0; i < setup.baseNationalities.length; i++) {
-				const nation = setup.baseNationalities[i];
+			for (const nation of setup.baseNationalities) {
 				const li = document.createElement("LI");
 				li.classList.add("customize-slave-trade-li");
 				li.append(nation);
@@ -125,7 +122,7 @@ App.UI.CustomSlaveTrade = function() {
 					App.UI.DOM.link(
 						`+`,
 						() => {
-							hashPush(V.nationalities, setup.baseNationalities[i]);
+							hashPush(V.nationalities, nation);
 							refresh();
 						}
 					),
@@ -138,9 +135,9 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`-`,
 							() => {
-								V.nationalities[setup.baseNationalities[i]] -= 1;
-								if (V.nationalities[setup.baseNationalities[i]] <= 0) {
-									delete V.nationalities[setup.baseNationalities[i]];
+								V.nationalities[nation] -= 1;
+								if (V.nationalities[nation] <= 0) {
+									delete V.nationalities[nation];
 								}
 								refresh();
 							}
@@ -155,7 +152,7 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`0`,
 							() => {
-								delete V.nationalities[setup.baseNationalities[i]];
+								delete V.nationalities[nation];
 								refresh();
 							}
 						),
@@ -172,7 +169,7 @@ App.UI.CustomSlaveTrade = function() {
 			for (const race of setup.filterRaces) {
 				const racialNationalities = setup.baseNationalities.filter(function(n) {
 					let races = setup.raceSelector[n] || setup.raceSelector[''];
-					return races[uncapFirstChar(race)] * 3.5 > hashSum(races);
+					return races[race.toLowerCase()] * 3.5 > hashSum(races);
 				});
 
 				if (racialNationalities.length > 0) {
@@ -188,10 +185,7 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`+`,
 							() => {
-								setup.baseNationalities.filter(function(n) {
-									let races = setup.raceSelector[n] || setup.raceSelector[''];
-									return races[uncapFirstChar(race)] * 3.5 > hashSum(races);
-								}).forEach(function(n) { hashPush(V.nationalities, n); });
+								racialNationalities.forEach(n => hashPush(V.nationalities, n));
 								refresh();
 							}
 						),
@@ -203,11 +197,7 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`0`,
 							() => {
-								setup.baseNationalities.filter(function(n) {
-									let races = setup.raceSelector[n] || setup.raceSelector[''];
-									return races[uncapFirstChar(race)] * 3.5 > hashSum(races);
-								}).forEach(function(n) { delete V.nationalities[n]; });
-
+								racialNationalities.forEach(n => delete V.nationalities[n]);
 								refresh();
 							}
 						),
@@ -221,10 +211,9 @@ App.UI.CustomSlaveTrade = function() {
 			/* Filtered pop controls */
 			const controlsNationality = setup[baseControlsFilter + 'Nationalities'];
 			const keys = Object.keys(controlsNationality);
-			for (let i = 0; i < keys.length; i++) {
+			for (const nation of keys) {
 				const li = document.createElement("LI");
 				li.classList.add("customize-slave-trade-li");
-				const nation = keys[i];
 				li.append(nation);
 				span = document.createElement("span");
 				span.classList.add("customize-slave-trade-li-container");
@@ -234,7 +223,7 @@ App.UI.CustomSlaveTrade = function() {
 					App.UI.DOM.link(
 						`+`,
 						() => {
-							hashPush(V.nationalities, keys[i]);
+							hashPush(V.nationalities, nation);
 							refresh();
 						}
 					),
@@ -248,9 +237,9 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`-`,
 							() => {
-								V.nationalities[keys[i]] -= 1;
-								if (V.nationalities[keys[i]] <= 0) {
-									delete V.nationalities[keys[i]];
+								V.nationalities[nation] -= 1;
+								if (V.nationalities[nation] <= 0) {
+									delete V.nationalities[nation];
 								}
 								refresh();
 							}
@@ -265,7 +254,7 @@ App.UI.CustomSlaveTrade = function() {
 						App.UI.DOM.link(
 							`0`,
 							() => {
-								delete V.nationalities[keys[i]];
+								delete V.nationalities[nation];
 								refresh();
 							}
 						),