1 files changed, 6 insertions, 10 deletions
diff --git a/LibMatrix/Extensions/CanonicalJsonSerializer.cs b/LibMatrix/Extensions/CanonicalJsonSerializer.cs
index a6fbcf4..55a4b1a 100644
--- a/LibMatrix/Extensions/CanonicalJsonSerializer.cs
+++ b/LibMatrix/Extensions/CanonicalJsonSerializer.cs
@@ -1,19 +1,14 @@
 using System.Collections.Frozen;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
-using System.Text.Unicode;
 using ArcaneLibs.Extensions;
 
 namespace LibMatrix.Extensions;
 
 public static class CanonicalJsonSerializer {
     // TODO: Alphabetise dictionaries
-    private static JsonSerializerOptions _options => new() {
+    private static JsonSerializerOptions JsonOptions => new() {
         WriteIndented = false,
         Encoder = UnicodeJsonEncoder.Singleton,
     };
@@ -24,7 +19,7 @@ public static class CanonicalJsonSerializer {
         .ToFrozenSet();
 
     private static JsonSerializerOptions MergeOptions(JsonSerializerOptions? inputOptions) {
-        var newOptions = _options;
+        var newOptions = JsonOptions;
         if (inputOptions == null)
             return newOptions;
         
@@ -48,7 +43,7 @@ public static class CanonicalJsonSerializer {
     public static String Serialize<TValue>(TValue value, JsonSerializerOptions? options = null) {
         var newOptions = MergeOptions(options);
 
-        return System.Text.Json.JsonSerializer.SerializeToNode(value, options) // We want to allow passing custom converters for eg. double/float -> string here...
+        return JsonSerializer.SerializeToNode(value, options) // We want to allow passing custom converters for eg. double/float -> string here...
             .SortProperties()!
             .CanonicalizeNumbers()!
             .ToJsonString(newOptions);
@@ -58,13 +53,14 @@ public static class CanonicalJsonSerializer {
         
     }
 
-    public static String Serialize(object value, Type inputType, JsonSerializerOptions? options = null) => JsonSerializer.Serialize(value, inputType, _options);
+    public static String Serialize(object value, Type inputType, JsonSerializerOptions? options = null) => JsonSerializer.Serialize(value, inputType, JsonOptions);
     // public static String Serialize<TValue>(TValue value, JsonTypeInfo<TValue> jsonTypeInfo) => JsonSerializer.Serialize(value, jsonTypeInfo, _options);
     // public static String Serialize(Object value, JsonTypeInfo jsonTypeInfo) 
 
 #endregion
 
-    private static partial class JsonExtensions {
+    // ReSharper disable once UnusedType.Local
+    private static class JsonExtensions {
         public static Action<JsonTypeInfo> AlphabetizeProperties(Type type) {
             return typeInfo => {
                 if (typeInfo.Kind != JsonTypeInfoKind.Object || !type.IsAssignableFrom(typeInfo.Type))