diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js
index e870f86402..717203eb90 100644
--- a/common/script/src/content/helpers.js
+++ b/common/script/src/content/helpers.js
@@ -40,17 +40,9 @@ export function merge(array=[]) {
 }
 
 //----------------------------------------
-// Spell Helpers
+// Set Defaults Helpers
 //----------------------------------------
 
-export function diminishingReturns(bonus, max, halfway=max/2) {
-  return max * (bonus / (bonus + halfway));
-};
-
-export function calculateBonus(value, stat, crit=1, stat_scale=0.5) {
-  return (value < 0 ? 1 : value + 1) + (stat * stat_scale * crit);
-};
-
 export function setSpellDefaults (className, spells) {
   let capitalClassName = formatForTranslator(className);
 
@@ -65,10 +57,6 @@ export function setSpellDefaults (className, spells) {
   });
 };
 
-//----------------------------------------
-// Food Helpers
-//----------------------------------------
-
 export function setFoodDefaults(food, options={}) {
   each(food, (item, name) => {
     let formattedName = formatForTranslator(name);
@@ -84,8 +72,22 @@ export function setFoodDefaults(food, options={}) {
   });
 };
 
+export function setHatchingPotionDefaults(hatchingPotions) {
+  each(hatchingPotions, (potion, key) => {
+    let text = translator(`hatchingPotion${key}`);
+    defaults(potion, {
+      key: key,
+      value: 2,
+      text: text,
+      notes: translator('hatchingPotionNotes', {
+        potText: text
+      }),
+    });
+  });
+}
+
 //----------------------------------------
-// Gear Helpers
+// Generators
 //----------------------------------------
 
 export function generateGearSet(gear, options={}) {
@@ -105,21 +107,6 @@ export function generateGearSet(gear, options={}) {
   });
 }
 
-function _getGearAttributes(gear) {
-  let attr = {};
-
-  if (gear.str) { attr.str = gear.str };
-  if (gear.con) { attr.con = gear.con };
-  if (gear.int) { attr.int = gear.int };
-  if (gear.per) { attr.per = gear.per };
-
-  return attr;
-}
-
-//----------------------------------------
-// Background Helpers
-//----------------------------------------
-
 export function generateBackgrounds(sets) {
   let backgrounds = {};
 
@@ -140,10 +127,6 @@ export function generateBackgrounds(sets) {
   return backgrounds;
 }
 
-//----------------------------------------
-// Egg Helpers
-//----------------------------------------
-
 export function generateEggs(set, options={}) {
   let eggs = {};
   let type = options.type;
@@ -171,19 +154,29 @@ export function generateEggs(set, options={}) {
 }
 
 //----------------------------------------
-// Hatching Potion Helpers
+// Spell Helpers
 //----------------------------------------
 
-export function setHatchingPotionDefaults(hatchingPotions) {
-  each(hatchingPotions, (potion, key) => {
-    let text = translator(`hatchingPotion${key}`);
-    defaults(potion, {
-      key: key,
-      value: 2,
-      text: text,
-      notes: translator('hatchingPotionNotes', {
-        potText: text
-      }),
-    });
-  });
+export function diminishingReturns(bonus, max, halfway=max/2) {
+  return max * (bonus / (bonus + halfway));
+};
+
+export function calculateBonus(value, stat, crit=1, stat_scale=0.5) {
+  return (value < 0 ? 1 : value + 1) + (stat * stat_scale * crit);
+};
+
+//----------------------------------------
+// Gear Helpers
+//----------------------------------------
+
+
+function _getGearAttributes(gear) {
+  let attr = {};
+
+  if (gear.str) { attr.str = gear.str };
+  if (gear.con) { attr.con = gear.con };
+  if (gear.int) { attr.int = gear.int };
+  if (gear.per) { attr.per = gear.per };
+
+  return attr;
 }