diff --git a/HearthDb.CardIdGenerator/Program.cs b/HearthDb.CardIdGenerator/Program.cs
index 1bd9fee3..c244192b 100644
--- a/HearthDb.CardIdGenerator/Program.cs
+++ b/HearthDb.CardIdGenerator/Program.cs
@@ -27,6 +27,7 @@ static void Main()
 			var decls = SyntaxBuilder.GetCollectible().Concat(SyntaxBuilder.GetNonCollectible());
 			var total = decls.Count();
 
+			Console.WriteLine("===== Formatting =====");
 			Parallel.ForEach(decls, (item) => {
 				var (name, decl) = item;
 				var cCardIds = ClassDeclaration("CardIds")
diff --git a/HearthDb.CardIdGenerator/SyntaxBuilder.cs b/HearthDb.CardIdGenerator/SyntaxBuilder.cs
index 5da9ea07..a357a188 100644
--- a/HearthDb.CardIdGenerator/SyntaxBuilder.cs
+++ b/HearthDb.CardIdGenerator/SyntaxBuilder.cs
@@ -29,7 +29,7 @@ internal class SyntaxBuilder
 					var className = c == "DREAM" ? "DreamCards" : CultureInfo.InvariantCulture.TextInfo.ToTitleCase(c.ToLower());
 					Console.WriteLine($"> Generating NonCollectible.{className}");
 					var classDecl = ClassDeclaration("NonCollectible").AddModifiers(Token(PublicKeyword), Token(PartialKeyword));
-					var cCard = ClassDeclaration(className).AddModifiers(Token(PublicKeyword), Token(PartialKeyword));
+					var cCard = ClassDeclaration(className).AddModifiers(Token(PublicKeyword));
 					var anyCards = false;
 					foreach(var card in
 						Cards.All.OrderBy(x => x.Value.Set)
@@ -163,7 +163,7 @@ private static string ResolveNamingConflict(string name, Card card, Dictionary<s
 					var className = CultureInfo.InvariantCulture.TextInfo.ToTitleCase(c.ToLower());
 					Console.WriteLine($"> Generating Collectible.{className}");
 					var classDecl = ClassDeclaration("Collectible").AddModifiers(Token(PublicKeyword), Token(PartialKeyword));
-					var cCard = ClassDeclaration(className).AddModifiers(Token(PublicKeyword), Token(PartialKeyword));
+					var cCard = ClassDeclaration(className).AddModifiers(Token(PublicKeyword));
 					foreach(var card in
 						Cards.All.Values.Where(x => x.Collectible && x.Class.ToString().Equals(c)))
 					{
diff --git a/HearthDb/CardIds.Collectible.Deathknight.cs b/HearthDb/CardIds.Collectible.Deathknight.cs
index 15eade82..4bd5f338 100644
--- a/HearthDb/CardIds.Collectible.Deathknight.cs
+++ b/HearthDb/CardIds.Collectible.Deathknight.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Deathknight
+            public class Deathknight
             {
                 public const string HardcoreCultist = "ETC_209";
                 public const string ClimacticNecroticExplosion = "ETC_210";
diff --git a/HearthDb/CardIds.Collectible.Demonhunter.cs b/HearthDb/CardIds.Collectible.Demonhunter.cs
index e570f2e7..a31728b9 100644
--- a/HearthDb/CardIds.Collectible.Demonhunter.cs
+++ b/HearthDb/CardIds.Collectible.Demonhunter.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Demonhunter
+            public class Demonhunter
             {
                 public const string BattlewornVanguard = "AV_118";
                 public const string KurtrusDemonRender = "AV_204";
diff --git a/HearthDb/CardIds.Collectible.Druid.cs b/HearthDb/CardIds.Collectible.Druid.cs
index 4c91c872..1a70bd5a 100644
--- a/HearthDb/CardIds.Collectible.Druid.cs
+++ b/HearthDb/CardIds.Collectible.Druid.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Druid
+            public class Druid
             {
                 public const string LivingRoots = "AT_037";
                 public const string DarnassusAspirant = "AT_038";
diff --git a/HearthDb/CardIds.Collectible.Hunter.cs b/HearthDb/CardIds.Collectible.Hunter.cs
index 763ebd14..3e4359dd 100644
--- a/HearthDb/CardIds.Collectible.Hunter.cs
+++ b/HearthDb/CardIds.Collectible.Hunter.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Hunter
+            public class Hunter
             {
                 public const string RamWrangler = "AT_010";
                 public const string Powershot = "AT_056";
diff --git a/HearthDb/CardIds.Collectible.Mage.cs b/HearthDb/CardIds.Collectible.Mage.cs
index 4c3b7cd0..ddbae593 100644
--- a/HearthDb/CardIds.Collectible.Mage.cs
+++ b/HearthDb/CardIds.Collectible.Mage.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Mage
+            public class Mage
             {
                 public const string FlameLanceTGT = "AT_001";
                 public const string Effigy = "AT_002";
diff --git a/HearthDb/CardIds.Collectible.Neutral.cs b/HearthDb/CardIds.Collectible.Neutral.cs
index 11a80888..ea575d5b 100644
--- a/HearthDb/CardIds.Collectible.Neutral.cs
+++ b/HearthDb/CardIds.Collectible.Neutral.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Neutral
+            public class Neutral
             {
                 public const string TwilightGuardian = "AT_017";
                 public const string SkycapnKragg = "AT_070";
diff --git a/HearthDb/CardIds.Collectible.Paladin.cs b/HearthDb/CardIds.Collectible.Paladin.cs
index ee866a3d..cf32d233 100644
--- a/HearthDb/CardIds.Collectible.Paladin.cs
+++ b/HearthDb/CardIds.Collectible.Paladin.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Paladin
+            public class Paladin
             {
                 public const string CompetitiveSpirit = "AT_073";
                 public const string SealOfChampions = "AT_074";
diff --git a/HearthDb/CardIds.Collectible.Priest.cs b/HearthDb/CardIds.Collectible.Priest.cs
index 3918c48d..764de79d 100644
--- a/HearthDb/CardIds.Collectible.Priest.cs
+++ b/HearthDb/CardIds.Collectible.Priest.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Priest
+            public class Priest
             {
                 public const string HolyChampion = "AT_011";
                 public const string SpawnOfShadowsTGT = "AT_012";
diff --git a/HearthDb/CardIds.Collectible.Rogue.cs b/HearthDb/CardIds.Collectible.Rogue.cs
index 65514d93..21266ab5 100644
--- a/HearthDb/CardIds.Collectible.Rogue.cs
+++ b/HearthDb/CardIds.Collectible.Rogue.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Rogue
+            public class Rogue
             {
                 public const string ShadoPanRiderTGT = "AT_028";
                 public const string Buccaneer = "AT_029";
diff --git a/HearthDb/CardIds.Collectible.Shaman.cs b/HearthDb/CardIds.Collectible.Shaman.cs
index a3d1d73c..0976de3d 100644
--- a/HearthDb/CardIds.Collectible.Shaman.cs
+++ b/HearthDb/CardIds.Collectible.Shaman.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Shaman
+            public class Shaman
             {
                 public const string TuskarrTotemicTGT = "AT_046";
                 public const string DraeneiTotemcarverTGT = "AT_047";
diff --git a/HearthDb/CardIds.Collectible.Warlock.cs b/HearthDb/CardIds.Collectible.Warlock.cs
index 8d332b31..70c09dc1 100644
--- a/HearthDb/CardIds.Collectible.Warlock.cs
+++ b/HearthDb/CardIds.Collectible.Warlock.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Warlock
+            public class Warlock
             {
                 public const string Dreadsteed = "AT_019";
                 public const string FearsomeDoomguard = "AT_020";
diff --git a/HearthDb/CardIds.Collectible.Warrior.cs b/HearthDb/CardIds.Collectible.Warrior.cs
index 221f2de7..ef119808 100644
--- a/HearthDb/CardIds.Collectible.Warrior.cs
+++ b/HearthDb/CardIds.Collectible.Warrior.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class Collectible
         {
-            public partial class Warrior
+            public class Warrior
             {
                 public const string Bash = "AT_064";
                 public const string KingsDefender = "AT_065";
diff --git a/HearthDb/CardIds.NonCollectible.Deathknight.cs b/HearthDb/CardIds.NonCollectible.Deathknight.cs
index 55a0d79d..8ac66699 100644
--- a/HearthDb/CardIds.NonCollectible.Deathknight.cs
+++ b/HearthDb/CardIds.NonCollectible.Deathknight.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Deathknight
+            public class Deathknight
             {
                 public const string TheLichKing_GhoulCharge = "HERO_11bp";
                 public const string TheLichKing_GhoulFrenzy1 = "HERO_11bp2";
diff --git a/HearthDb/CardIds.NonCollectible.Demonhunter.cs b/HearthDb/CardIds.NonCollectible.Demonhunter.cs
index 01132f16..3324bcc3 100644
--- a/HearthDb/CardIds.NonCollectible.Demonhunter.cs
+++ b/HearthDb/CardIds.NonCollectible.Demonhunter.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Demonhunter
+            public class Demonhunter
             {
                 public const string ChaosStrikeBASIC = "RLK_Prologue_BT_035";
                 public const string ChaosStrike_ChaosStrikeEnchantment = "RLK_Prologue_BT_035e";
diff --git a/HearthDb/CardIds.NonCollectible.DreamCards.cs b/HearthDb/CardIds.NonCollectible.DreamCards.cs
index 7a242888..cb8a737b 100644
--- a/HearthDb/CardIds.NonCollectible.DreamCards.cs
+++ b/HearthDb/CardIds.NonCollectible.DreamCards.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class DreamCards
+            public class DreamCards
             {
                 public const string LaughingSister = "DREAM_01";
                 public const string YseraAwakens = "DREAM_02";
diff --git a/HearthDb/CardIds.NonCollectible.Druid.cs b/HearthDb/CardIds.NonCollectible.Druid.cs
index e4aa15b7..9b4bf752 100644
--- a/HearthDb/CardIds.NonCollectible.Druid.cs
+++ b/HearthDb/CardIds.NonCollectible.Druid.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Druid
+            public class Druid
             {
                 public const string Wrath_SolarWrath = "EX1_154a";
                 public const string Wrath_NaturesWrath = "EX1_154b";
diff --git a/HearthDb/CardIds.NonCollectible.Hunter.cs b/HearthDb/CardIds.NonCollectible.Hunter.cs
index 73fae52e..aeee685b 100644
--- a/HearthDb/CardIds.NonCollectible.Hunter.cs
+++ b/HearthDb/CardIds.NonCollectible.Hunter.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Hunter
+            public class Hunter
             {
                 public const string MultiShot = "RLK_Prologue_DS1_183";
                 public const string ArcaneShotBASIC = "RLK_Prologue_DS1_185";
diff --git a/HearthDb/CardIds.NonCollectible.Invalid.cs b/HearthDb/CardIds.NonCollectible.Invalid.cs
index 955db8aa..6bc6d583 100644
--- a/HearthDb/CardIds.NonCollectible.Invalid.cs
+++ b/HearthDb/CardIds.NonCollectible.Invalid.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Invalid
+            public class Invalid
             {
                 public const string BombsAwayTavernBrawl2 = "FB_Juggernaut_MinionEnchant";
                 public const string InnkeeperHealthSet = "FB_LK_BossSetup001";
diff --git a/HearthDb/CardIds.NonCollectible.Mage.cs b/HearthDb/CardIds.NonCollectible.Mage.cs
index a0367db1..aaa4445d 100644
--- a/HearthDb/CardIds.NonCollectible.Mage.cs
+++ b/HearthDb/CardIds.NonCollectible.Mage.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Mage
+            public class Mage
             {
                 public const string JainaProudmoore_FireblastRank2 = "HERO_08xbp2";
                 public const string EtherealArcanist_RawPowerEnchantment = "EX1_274e";
diff --git a/HearthDb/CardIds.NonCollectible.Neutral.cs b/HearthDb/CardIds.NonCollectible.Neutral.cs
index 79b28350..bd34c887 100644
--- a/HearthDb/CardIds.NonCollectible.Neutral.cs
+++ b/HearthDb/CardIds.NonCollectible.Neutral.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Neutral
+            public class Neutral
             {
                 public const string BoulderfistOgreBASIC = "BG_CS2_200";
                 public const string BoulderfistOgre_BoulderfistOgre = "BG_CS2_200_G";
diff --git a/HearthDb/CardIds.NonCollectible.Paladin.cs b/HearthDb/CardIds.NonCollectible.Paladin.cs
index 9de803f7..d5d722a1 100644
--- a/HearthDb/CardIds.NonCollectible.Paladin.cs
+++ b/HearthDb/CardIds.NonCollectible.Paladin.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Paladin
+            public class Paladin
             {
                 public const string BlessingOfMight = "RLK_Prologue_CS2_087";
                 public const string BlessingofMight_BlessingOfMight = "RLK_Prologue_CS2_087_AI";
diff --git a/HearthDb/CardIds.NonCollectible.Priest.cs b/HearthDb/CardIds.NonCollectible.Priest.cs
index 144ee8f9..50e300f7 100644
--- a/HearthDb/CardIds.NonCollectible.Priest.cs
+++ b/HearthDb/CardIds.NonCollectible.Priest.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Priest
+            public class Priest
             {
                 public const string InnerFire_InnerFireEnchantment = "CS1_129e";
                 public const string KulTiranChaplain_AidedEnchantment = "EX1_195e";
diff --git a/HearthDb/CardIds.NonCollectible.Rogue.cs b/HearthDb/CardIds.NonCollectible.Rogue.cs
index 2868b0fc..6a90892b 100644
--- a/HearthDb/CardIds.NonCollectible.Rogue.cs
+++ b/HearthDb/CardIds.NonCollectible.Rogue.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Rogue
+            public class Rogue
             {
                 public const string ColdBlood_ColdBloodEnchantment1 = "CS2_073e";
                 public const string ColdBlood_ColdBloodEnchantment2 = "CS2_073e2";
diff --git a/HearthDb/CardIds.NonCollectible.Shaman.cs b/HearthDb/CardIds.NonCollectible.Shaman.cs
index 1a81307e..8e4ab80d 100644
--- a/HearthDb/CardIds.NonCollectible.Shaman.cs
+++ b/HearthDb/CardIds.NonCollectible.Shaman.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Shaman
+            public class Shaman
             {
                 public const string AncestralSpirit_AncestralSpiritEnchantment = "CS2_038e";
                 public const string FarSight_FarSightEnchantment = "CS2_053e";
diff --git a/HearthDb/CardIds.NonCollectible.Warlock.cs b/HearthDb/CardIds.NonCollectible.Warlock.cs
index 3ba7d38d..7fb01cea 100644
--- a/HearthDb/CardIds.NonCollectible.Warlock.cs
+++ b/HearthDb/CardIds.NonCollectible.Warlock.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Warlock
+            public class Warlock
             {
                 public const string VoidwalkerBASIC = "BG_CS2_065";
                 public const string MortalCoil = "RLK_Prologue_EX1_302";
diff --git a/HearthDb/CardIds.NonCollectible.Warrior.cs b/HearthDb/CardIds.NonCollectible.Warrior.cs
index 8720db41..5a9809d6 100644
--- a/HearthDb/CardIds.NonCollectible.Warrior.cs
+++ b/HearthDb/CardIds.NonCollectible.Warrior.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Warrior
+            public class Warrior
             {
                 public const string Rampage_RampageEnchantment = "CS2_104e";
                 public const string ArathiWeaponsmith_BattleAxeToken = "EX1_398t";
diff --git a/HearthDb/CardIds.NonCollectible.Whizbang.cs b/HearthDb/CardIds.NonCollectible.Whizbang.cs
index fa31b615..79a632c5 100644
--- a/HearthDb/CardIds.NonCollectible.Whizbang.cs
+++ b/HearthDb/CardIds.NonCollectible.Whizbang.cs
@@ -5,7 +5,7 @@ public partial class CardIds
     {
         public partial class NonCollectible
         {
-            public partial class Whizbang
+            public class Whizbang
             {
                 public const string WhizbangTheWonderfulHeroic = "BOT_914h";
                 public const string ZayleShadowCloakHeroic = "DAL_800h";