diff --git a/Common/Assemblies/Rjw-Genes.dll b/Common/Assemblies/Rjw-Genes.dll
index 23a91e9..2485a6c 100644
Binary files a/Common/Assemblies/Rjw-Genes.dll and b/Common/Assemblies/Rjw-Genes.dll differ
diff --git a/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs b/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
index f521fb8..8420f46 100644
--- a/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
+++ b/Source/Genes/Genitalia/Defs/GenitaliaTypeExtension.cs
@@ -8,13 +8,10 @@ namespace RJW_Genes
 {
     public class GenitaliaTypeExtension : DefModExtension
     {
-        private HediffDef_PartBase penis;
-        public HediffDef_PartBase Penis => penis ?? (HediffDef_PartBase) Genital_Helper.average_penis;
+        public HediffDef_PartBase penis;
 
-        private HediffDef_PartBase vagina;
-        public HediffDef_PartBase Vagina => vagina ?? (HediffDef_PartBase) Genital_Helper.average_vagina;
+        public HediffDef_PartBase vagina;
 
-        private HediffDef_PartBase anus;
-        public HediffDef_PartBase Anus => anus ?? (HediffDef_PartBase) Genital_Helper.average_anus;
+        public HediffDef_PartBase anus;
     }
 }
diff --git a/Source/Genes/Genitalia/Gene_GenitaliaType.cs b/Source/Genes/Genitalia/Gene_GenitaliaType.cs
index 6163d2b..8cdb1a5 100644
--- a/Source/Genes/Genitalia/Gene_GenitaliaType.cs
+++ b/Source/Genes/Genitalia/Gene_GenitaliaType.cs
@@ -25,7 +25,7 @@ namespace RJW_Genes
                 ModLog.Error($"Gene {def} failed to change genitals - Need a modExtension with Class=\"{typeof(GenitaliaTypeExtension).FullName}\".");
                 return;
             }
-            GenitaliaChanger.ChangeGenitalia(pawn, genitals.Penis, genitals.Vagina, genitals.Anus);
+            GenitaliaChanger.ChangeGenitalia(pawn, genitals.penis, genitals.vagina, genitals.anus);
         }
     }
 }
\ No newline at end of file
diff --git a/Source/Genes/Genitalia/GenitaliaUtility.cs b/Source/Genes/Genitalia/GenitaliaUtility.cs
index 7c889df..b2c4488 100644
--- a/Source/Genes/Genitalia/GenitaliaUtility.cs
+++ b/Source/Genes/Genitalia/GenitaliaUtility.cs
@@ -29,28 +29,19 @@ namespace RJW_Genes
 
         public static HediffDef GetPenisForGene(GeneDef gene)
         {
-            if (gene == null)
-                return Genital_Helper.average_penis;
-
-            return gene.GetModExtension<GenitaliaTypeExtension>()?.Penis ?? Genital_Helper.average_penis;
+            return gene?.GetModExtension<GenitaliaTypeExtension>()?.penis ?? Genital_Helper.average_penis;
         }
 
 
         public static HediffDef GetVaginaForGene(GeneDef gene)
         {
-            if (gene == null)
-                return Genital_Helper.average_vagina;
-
-            return gene.GetModExtension<GenitaliaTypeExtension>()?.Vagina ?? Genital_Helper.average_vagina;
+            return gene?.GetModExtension<GenitaliaTypeExtension>()?.vagina ?? Genital_Helper.average_vagina;
         }
 
         public static HediffDef GetAnusForGene(GeneDef gene)
         {
-            if (gene == null)
-                return Genital_Helper.average_anus;
-            
             //TODO: Do I want the default to be generic or average for feline,equine and canine?
-            return gene.GetModExtension<GenitaliaTypeExtension>()?.Anus ?? Genital_Helper.average_anus;
+            return gene?.GetModExtension<GenitaliaTypeExtension>()?.anus ?? Genital_Helper.average_anus;
         }
 
         public static HediffDef GetBreastsForGene(GeneDef gene)