diff --git a/CHANGELIST.md b/CHANGELIST.md
index 22f037c9..96bf200e 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -55,6 +55,7 @@
 - Add support for all ISO region codes
 - Ensure ordering in output site tags
 - Make site code formatting helper method
+- Better helper method organization
 
 ### 2.2 (2021-12-30)
 - Fix Saturn header finding
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index bd092b8f..5101d7a0 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -1060,28 +1060,6 @@ namespace MPF.Library
             AddIfExists(output, key, string.Join(", ", value.Select(o => o.ToString())), indent);
         }
 
-        /// <summary>
-        /// Format a single site tag to string
-        /// </summary>
-        /// <param name="kvp">KeyValuePair representing the site tag and value</param>
-        /// <returns>String-formatted tag and value</returns>
-        private static string FormatSiteTag(KeyValuePair<SiteCode?, string> kvp)
-        {
-            bool isMultiLine = IsMultiLine(kvp.Key);
-            string line = $"{kvp.Key.ShortName()}{(isMultiLine ? "\n" : " ")}";
-
-            // Special case for boolean fields
-            if (kvp.Key == SiteCode.PostgapType || kvp.Key == SiteCode.VCD)
-            {
-                if (kvp.Value != true.ToString())
-                    return string.Empty;
-
-                return line.Trim();
-            }
-
-            return $"{line}{kvp.Value}{(isMultiLine ? "\n" : string.Empty)}";
-        }
-
         #endregion
 
         #region Normalization
@@ -1700,31 +1678,6 @@ namespace MPF.Library
             }
         }
 
-        /// <summary>
-        /// Check if a site code is multi-line or not
-        /// </summary>
-        /// <param name="siteCode">SiteCode to check</param>
-        /// <returns>True if the code field is multiline by default, false otherwise</returns>
-        /// <remarks>TODO: This should move to Extensions at some point</remarks>
-        private static bool IsMultiLine(SiteCode? siteCode)
-        {
-            switch (siteCode)
-            {
-                case SiteCode.Extras:
-                case SiteCode.GameFootage:
-                case SiteCode.NetYarozeGames:
-                case SiteCode.Patches:
-                case SiteCode.PlayableDemos:
-                case SiteCode.RollingDemos:
-                case SiteCode.Savegames:
-                case SiteCode.TechDemos:
-                case SiteCode.Videos:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
         /// <summary>
         /// Process a text block and replace with internal identifiers
         /// </summary>
@@ -1854,5 +1807,74 @@ namespace MPF.Library
         }
 
         #endregion
+
+        #region Helpers
+
+        /// <summary>
+        /// Format a single site tag to string
+        /// </summary>
+        /// <param name="kvp">KeyValuePair representing the site tag and value</param>
+        /// <returns>String-formatted tag and value</returns>
+        private static string FormatSiteTag(KeyValuePair<SiteCode?, string> kvp)
+        {
+            bool isMultiLine = IsMultiLine(kvp.Key);
+            string line = $"{kvp.Key.ShortName()}{(isMultiLine ? "\n" : " ")}";
+
+            // Special case for boolean fields
+            if (IsBoolean(kvp.Key))
+            {
+                if (kvp.Value != true.ToString())
+                    return string.Empty;
+
+                return line.Trim();
+            }
+
+            return $"{line}{kvp.Value}{(isMultiLine ? "\n" : string.Empty)}";
+        }
+
+        /// <summary>
+        /// Check if a site code is boolean or not
+        /// </summary>
+        /// <param name="siteCode">SiteCode to check</param>
+        /// <returns>True if the code field is a flag with no value, false otherwise</returns>
+        /// <remarks>TODO: This should move to Extensions at some point</remarks>
+        private static bool IsBoolean(SiteCode? siteCode)
+        {
+            switch (siteCode)
+            {
+                case SiteCode.PostgapType:
+                case SiteCode.VCD:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Check if a site code is multi-line or not
+        /// </summary>
+        /// <param name="siteCode">SiteCode to check</param>
+        /// <returns>True if the code field is multiline by default, false otherwise</returns>
+        /// <remarks>TODO: This should move to Extensions at some point</remarks>
+        private static bool IsMultiLine(SiteCode? siteCode)
+        {
+            switch (siteCode)
+            {
+                case SiteCode.Extras:
+                case SiteCode.GameFootage:
+                case SiteCode.NetYarozeGames:
+                case SiteCode.Patches:
+                case SiteCode.PlayableDemos:
+                case SiteCode.RollingDemos:
+                case SiteCode.Savegames:
+                case SiteCode.TechDemos:
+                case SiteCode.Videos:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        #endregion
     }
 }