From a2609d619d1e61e58788ff6e135e3a880c48a283 Mon Sep 17 00:00:00 2001
From: Dedmen Miller <dedmen@dedmen.de>
Date: Wed, 21 Nov 2018 18:03:32 +0100
Subject: [PATCH 1/4] Vanilla magwells

---
 addons/jam/CfgMagazineWells.hpp |  6 +-----
 addons/jam/magwells_545x39.hpp  | 10 ++--------
 addons/jam/magwells_556x45.hpp  | 15 ++++-----------
 addons/jam/magwells_580x42.hpp  | 15 +++------------
 addons/jam/magwells_65x39.hpp   | 24 ++++--------------------
 addons/jam/magwells_762x39.hpp  |  9 +--------
 6 files changed, 15 insertions(+), 64 deletions(-)

diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 8361e0987..7a242340b 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -69,9 +69,5 @@ class CfgMagazineWells {
     class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
     class CBA_PIAT {};          // PIAT
 
-    class CBA_RPG7 {
-        BI_rockets[] = {
-            "RPG7_F"
-        };
-    };
+    class RPG7 {};
 };
diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp
index 4c242af6c..40d6e96b4 100644
--- a/addons/jam/magwells_545x39.hpp
+++ b/addons/jam/magwells_545x39.hpp
@@ -1,10 +1,4 @@
-    class CBA_545x39_AK {       // Standard AK-74 magazines
-        BI_mags[] = {
-            "30Rnd_545x39_Mag_F",
-            "30Rnd_545x39_Mag_Green_F",
-            "30Rnd_545x39_Mag_Tracer_F",
-            "30Rnd_545x39_Mag_Tracer_Green_F"
-        };
-    };
+    class AK_545x39 {};         // Standard AK-74 magazines
+    
 
     class CBA_545x39_RPK {};    // 45rnd RPK-74
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 14b3f50d7..8dfdf1fde 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/addons/jam/magwells_556x45.hpp
@@ -13,22 +13,15 @@
         };
     };
 
+    class M249_556x45 {};
+    
     class CBA_556x45_TYPE97 {};         // QBZ-97 Stick Mags
     class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
     class CBA_556x45_SG550 {};
 
-    class CBA_556x45_STANAG {           // STANAG mags, standard length, including small drums
-        BI_mags[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_green",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow"
-        };
-    };
+    class STANAG_556x45 {};         // STANAG mags, standard length, including small drums
 
-    class CBA_556x45_STANAG_L {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
+    class STANAG_556x45_Large {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
     class CBA_556x45_STANAG_XL {};      // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100)
     class CBA_556x45_STANAG_2D {};      // STANAG mags, twin drums (100rnd Beta C-MAG)
     class CBA_556x45_STANAG_2D_XL {     // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG)
diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp
index d5b7de3b2..787b96b73 100644
--- a/addons/jam/magwells_580x42.hpp
+++ b/addons/jam/magwells_580x42.hpp
@@ -1,13 +1,4 @@
-    class CBA_580x42_TYPE95 {           // QBZ-95 Stick Mags
-        BI_mags[] = {
-            "30Rnd_580x42_Mag_F",
-            "30Rnd_580x42_Mag_Tracer_F"
-        };
-    };
+    class CTAR_580x42 {};           // QBZ-95 Stick Mags
+
+    class CTAR_580x42_Large {};       // QBB-95 LSW Drums
 
-    class CBA_580x42_TYPE95_XL {        // QBB-95 LSW Drums
-        BI_drums[] = {
-            "100Rnd_580x42_Mag_F",
-            "100Rnd_580x42_Mag_Tracer_F"
-        };
-    };
diff --git a/addons/jam/magwells_65x39.hpp b/addons/jam/magwells_65x39.hpp
index 6f7840232..04e944734 100644
--- a/addons/jam/magwells_65x39.hpp
+++ b/addons/jam/magwells_65x39.hpp
@@ -1,11 +1,5 @@
-    class CBA_65x39_MX {
-        BI_mags[] = {
-            "30Rnd_65x39_caseless_mag",
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_mag_Tracer",
-            "30Rnd_65x39_caseless_green_mag_Tracer"
-        };
-    };
+    class MX_65x39 {};
+
     class CBA_65x39_MX_XL {
         BI_mags[] = {
             "100Rnd_65x39_caseless_mag",
@@ -13,16 +7,6 @@
         };
     };
 
-    class CBA_65x39_Mk200 {
-        BI_mags[] = {
-            "200Rnd_65x39_cased_Box",
-            "200Rnd_65x39_cased_Box_Tracer"
-        };
-    };
+    class Mk200_65x39 {};
 
-    class CBA_65x39_Katiba {
-        BI_mags[] = {
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_green_mag_Tracer"
-        };
-    };
+    class Katiba_65x39 {};
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index 53f7f1749..f14d185ec 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/addons/jam/magwells_762x39.hpp
@@ -1,11 +1,4 @@
-    class CBA_762x39_AK {               // Standard AK-47/AKM magazines
-        BI_mags[] = {
-            "30Rnd_762x39_Mag_F",
-            "30Rnd_762x39_Mag_Green_F",
-            "30Rnd_762x39_Mag_Tracer_F",
-            "30Rnd_762x39_Mag_Tracer_Green_F"
-        };
-    };
+    class AK_762x39 {};                 // Standard AK-47/AKM magazines
 
     class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines
 

From 70c466c32296511ca3b399ef1eed78a96248b86c Mon Sep 17 00:00:00 2001
From: Dedmen Miller <dedmen@dedmen.de>
Date: Wed, 21 Nov 2018 18:19:20 +0100
Subject: [PATCH 2/4] keep dummy and deprecate

---
 addons/jam/CfgMagazineWells.hpp |  5 +++++
 addons/jam/magwells_545x39.hpp  | 10 +++++++++-
 addons/jam/magwells_556x45.hpp  | 14 ++++++++++++++
 addons/jam/magwells_580x42.hpp  | 15 +++++++++++++++
 addons/jam/magwells_65x39.hpp   | 34 ++++++++++++++++++++++++++++++---
 addons/jam/magwells_762x39.hpp  | 11 ++++++++++-
 6 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 7a242340b..25c224aa2 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -69,5 +69,10 @@ class CfgMagazineWells {
     class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
     class CBA_PIAT {};          // PIAT
 
+    class CBA_RPG7 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_rockets[] = {
+            "RPG7_F"
+        };
+    };
     class RPG7 {};
 };
diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp
index 40d6e96b4..eb6e0e942 100644
--- a/addons/jam/magwells_545x39.hpp
+++ b/addons/jam/magwells_545x39.hpp
@@ -1,4 +1,12 @@
+    class CBA_545x39_AK {       //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_545x39_Mag_F",
+            "30Rnd_545x39_Mag_Green_F",
+            "30Rnd_545x39_Mag_Tracer_F",
+            "30Rnd_545x39_Mag_Tracer_Green_F"
+        };
+    };
+
     class AK_545x39 {};         // Standard AK-74 magazines
     
-
     class CBA_545x39_RPK {};    // 45rnd RPK-74
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 8dfdf1fde..9060726c7 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/addons/jam/magwells_556x45.hpp
@@ -19,6 +19,20 @@
     class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
     class CBA_556x45_SG550 {};
 
+    
+    class CBA_556x45_STANAG {           //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_556x45_Stanag",
+            "30Rnd_556x45_Stanag_green",
+            "30Rnd_556x45_Stanag_red",
+            "30Rnd_556x45_Stanag_Tracer_Red",
+            "30Rnd_556x45_Stanag_Tracer_Green",
+            "30Rnd_556x45_Stanag_Tracer_Yellow"
+        };
+    };
+
+    class CBA_556x45_STANAG_L {};       //This is DEPRECATED! Don't use it! Use the vanilla one instead
+
     class STANAG_556x45 {};         // STANAG mags, standard length, including small drums
 
     class STANAG_556x45_Large {};       // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60)
diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp
index 787b96b73..c87039001 100644
--- a/addons/jam/magwells_580x42.hpp
+++ b/addons/jam/magwells_580x42.hpp
@@ -1,3 +1,18 @@
+    class CBA_580x42_TYPE95 {           //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_580x42_Mag_F",
+            "30Rnd_580x42_Mag_Tracer_F"
+        };
+    };
+
+    class CBA_580x42_TYPE95_XL {        //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_drums[] = {
+            "100Rnd_580x42_Mag_F",
+            "100Rnd_580x42_Mag_Tracer_F"
+        };
+    };
+    
+    
     class CTAR_580x42 {};           // QBZ-95 Stick Mags
 
     class CTAR_580x42_Large {};       // QBB-95 LSW Drums
diff --git a/addons/jam/magwells_65x39.hpp b/addons/jam/magwells_65x39.hpp
index 04e944734..5830c3d27 100644
--- a/addons/jam/magwells_65x39.hpp
+++ b/addons/jam/magwells_65x39.hpp
@@ -1,12 +1,40 @@
+    class CBA_65x39_MX { //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_65x39_caseless_mag",
+            "30Rnd_65x39_caseless_green",
+            "30Rnd_65x39_caseless_mag_Tracer",
+            "30Rnd_65x39_caseless_green_mag_Tracer"
+        };
+    };
+    
+    
     class MX_65x39 {};
-
+    
     class CBA_65x39_MX_XL {
         BI_mags[] = {
             "100Rnd_65x39_caseless_mag",
             "100Rnd_65x39_caseless_mag_Tracer"
         };
     };
-
+    
+    
+    class CBA_65x39_Mk200 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "200Rnd_65x39_cased_Box",
+            "200Rnd_65x39_cased_Box_Tracer"
+        };
+    };
+    
+    class CBA_65x39_Katiba { //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_65x39_caseless_green",
+            "30Rnd_65x39_caseless_green_mag_Tracer"
+        };
+    };
+    
     class Mk200_65x39 {};
-
+    
     class Katiba_65x39 {};
+    
+    
+    
\ No newline at end of file
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index f14d185ec..562347a0e 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/addons/jam/magwells_762x39.hpp
@@ -1,4 +1,13 @@
-    class AK_762x39 {};                 // Standard AK-47/AKM magazines
+    class CBA_762x39_AK {               //This is DEPRECATED! Don't use it! Use the vanilla one instead
+        BI_mags[] = {
+            "30Rnd_762x39_Mag_F",
+            "30Rnd_762x39_Mag_Green_F",
+            "30Rnd_762x39_Mag_Tracer_F",
+            "30Rnd_762x39_Mag_Tracer_Green_F"
+        };
+    };
+	
+	class AK_762x39 {};                 // Standard AK-47/AKM magazines
 
     class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines
 

From 566f82ae65634648fef6819db0b3e0631e38f414 Mon Sep 17 00:00:00 2001
From: Dedmen Miller <dedmen@dedmen.de>
Date: Sun, 2 Dec 2018 09:49:00 +0100
Subject: [PATCH 3/4] Add magwells to vanilla instead of overwriting

---
 addons/jam/CfgWeapons.hpp | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp
index 84ef0e85a..d86a33e58 100644
--- a/addons/jam/CfgWeapons.hpp
+++ b/addons/jam/CfgWeapons.hpp
@@ -5,96 +5,96 @@ class CfgWeapons {
     class Launcher_Base_F;
 
     class mk20_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class SDAR_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] += {"CBA_556x45_STANAG"};
     };
     class Tavor_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class arifle_SPAR_01_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
     class arifle_SPAR_02_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
+        magazineWell[] += {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
 
     class UGL_F : GrenadeLauncher {
-        magazineWell[] = {"CBA_40mm_M203", "CBA_40mm_EGLM"};
+        magazineWell[] += {"CBA_40mm_M203", "CBA_40mm_EGLM"};
     };
 
     class arifle_MX_Base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
+        magazineWell[] += {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
         class GL_3GL_F : UGL_F {
-            magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
+            magazineWell[] += {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
         };
     };
 
     class arifle_Katiba_Base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_Katiba"};
+        magazineWell[] += {"CBA_65x39_Katiba"};
     };
 
     class arifle_ARX_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_Katiba"};
+        magazineWell[] += {"CBA_65x39_Katiba"};
     };
 
     class EBR_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_M14"};
+        magazineWell[] += {"CBA_762x51_M14"};
     };
     class DMR_03_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_MkI_EMR"};
+        magazineWell[] += {"CBA_762x51_MkI_EMR"};
     };
     class DMR_06_base_F: Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x51_M14"};
+        magazineWell[] += {"CBA_762x51_M14"};
     };
     class arifle_SPAR_03_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"};
+        magazineWell[] += {"CBA_762x51_HK417", "CBA_762x51_HK417_L", "CBA_762x51_HK417_XL"};
     };
 
     class DMR_01_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x54R_SVD"};
+        magazineWell[] += {"CBA_762x54R_SVD"};
     };
 
     class arifle_CTAR_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
+        magazineWell[] += {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
     };
     class arifle_CTARS_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
+        magazineWell[] += {"CBA_580x42_TYPE95", "CBA_580x42_TYPE95_XL"};
     };
 
     class arifle_AK12_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"};
+        magazineWell[] += {"CBA_762x39_AK", "CBA_762x39_RPK"};
     };
     class arifle_AKM_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"};
+        magazineWell[] += {"CBA_762x39_AK", "CBA_762x39_RPK"};
     };
 
     class arifle_AKS_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_RPK"};
+        magazineWell[] += {"CBA_545x39_AK", "CBA_545x39_RPK"};
     };
 
     class LMG_03_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_556x45_MINIMI"};
+        magazineWell[] += {"CBA_556x45_MINIMI"};
     };
 
     class LMG_Mk200_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_65x39_Mk200"};
+        magazineWell[] += {"CBA_65x39_Mk200"};
     };
 
     class LMG_Zafir_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_762x54R_LINKS"};
+        magazineWell[] += {"CBA_762x54R_LINKS"};
     };
 
     class launch_RPG7_F : Launcher_Base_F {
-        magazineWell[] = {"CBA_RPG7"};
+        magazineWell[] += {"CBA_RPG7"};
     };
 
     class MMG_01_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_93x64_LINKS"};
+        magazineWell[] += {"CBA_93x64_LINKS"};
     };
 
     class MMG_02_base_F : Rifle_Long_Base_F {
-        magazineWell[] = {"CBA_338NM_LINKS"};
+        magazineWell[] += {"CBA_338NM_LINKS"};
     };
 };

From 49787cf68e8d4ef1725472a1ff23c2100650a9c0 Mon Sep 17 00:00:00 2001
From: Dedmen Miller <dedmen@dedmen.de>
Date: Sun, 2 Dec 2018 09:52:38 +0100
Subject: [PATCH 4/4] no tabz or empty lines with spaces

---
 addons/jam/magwells_357Mag.hpp |  1 -
 addons/jam/magwells_545x39.hpp |  2 +-
 addons/jam/magwells_556x45.hpp |  2 +-
 addons/jam/magwells_580x42.hpp |  4 ++--
 addons/jam/magwells_65x39.hpp  | 19 ++++++++-----------
 addons/jam/magwells_762x39.hpp |  4 ++--
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/jam/magwells_357Mag.hpp b/addons/jam/magwells_357Mag.hpp
index 977788e5a..0f8bf88b0 100644
--- a/addons/jam/magwells_357Mag.hpp
+++ b/addons/jam/magwells_357Mag.hpp
@@ -3,4 +3,3 @@
 
     class CBA_357_6rnds {};             // 6 loose rounds of .357 Magnum
     class CBA_357_5rnds {};             // 5 loose rounds of .357 Magnum
-    
diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp
index eb6e0e942..9600904a3 100644
--- a/addons/jam/magwells_545x39.hpp
+++ b/addons/jam/magwells_545x39.hpp
@@ -8,5 +8,5 @@
     };
 
     class AK_545x39 {};         // Standard AK-74 magazines
-    
+
     class CBA_545x39_RPK {};    // 45rnd RPK-74
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 9060726c7..e26c14130 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/addons/jam/magwells_556x45.hpp
@@ -19,7 +19,7 @@
     class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
     class CBA_556x45_SG550 {};
 
-    
+
     class CBA_556x45_STANAG {           //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_556x45_Stanag",
diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp
index c87039001..e67bec5f0 100644
--- a/addons/jam/magwells_580x42.hpp
+++ b/addons/jam/magwells_580x42.hpp
@@ -11,8 +11,8 @@
             "100Rnd_580x42_Mag_Tracer_F"
         };
     };
-    
-    
+
+
     class CTAR_580x42 {};           // QBZ-95 Stick Mags
 
     class CTAR_580x42_Large {};       // QBB-95 LSW Drums
diff --git a/addons/jam/magwells_65x39.hpp b/addons/jam/magwells_65x39.hpp
index 5830c3d27..41e33ffe3 100644
--- a/addons/jam/magwells_65x39.hpp
+++ b/addons/jam/magwells_65x39.hpp
@@ -6,35 +6,32 @@
             "30Rnd_65x39_caseless_green_mag_Tracer"
         };
     };
-    
-    
+
+
     class MX_65x39 {};
-    
+
     class CBA_65x39_MX_XL {
         BI_mags[] = {
             "100Rnd_65x39_caseless_mag",
             "100Rnd_65x39_caseless_mag_Tracer"
         };
     };
-    
-    
+
+
     class CBA_65x39_Mk200 { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "200Rnd_65x39_cased_Box",
             "200Rnd_65x39_cased_Box_Tracer"
         };
     };
-    
+
     class CBA_65x39_Katiba { //This is DEPRECATED! Don't use it! Use the vanilla one instead
         BI_mags[] = {
             "30Rnd_65x39_caseless_green",
             "30Rnd_65x39_caseless_green_mag_Tracer"
         };
     };
-    
+
     class Mk200_65x39 {};
-    
+
     class Katiba_65x39 {};
-    
-    
-    
\ No newline at end of file
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index 562347a0e..40e02a4db 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/addons/jam/magwells_762x39.hpp
@@ -6,8 +6,8 @@
             "30Rnd_762x39_Mag_Tracer_Green_F"
         };
     };
-	
-	class AK_762x39 {};                 // Standard AK-47/AKM magazines
+
+    class AK_762x39 {};                 // Standard AK-47/AKM magazines
 
     class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines