diff --git a/src/Persistence/Collections/ControlPropertiesCollection.cs b/src/Persistence/Collections/ControlPropertiesCollection.cs
index f4d3e17d..5b8c07da 100644
--- a/src/Persistence/Collections/ControlPropertiesCollection.cs
+++ b/src/Persistence/Collections/ControlPropertiesCollection.cs
@@ -7,7 +7,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
 
 public class ControlPropertiesCollection : NamedItemsCollection<ControlProperty>
 {
-    private readonly static Func<ControlProperty, string> _keySelector = v => v.Name;
+    private static readonly Func<ControlProperty, string> _keySelector = v => v.Name;
 
     public ControlPropertiesCollection() : base(_keySelector)
     {
diff --git a/src/Persistence/Collections/CustomPropertiesCollection.cs b/src/Persistence/Collections/CustomPropertiesCollection.cs
index 7bcfe384..f368bb34 100644
--- a/src/Persistence/Collections/CustomPropertiesCollection.cs
+++ b/src/Persistence/Collections/CustomPropertiesCollection.cs
@@ -7,7 +7,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
 
 public class CustomPropertiesCollection : NamedItemsCollection<CustomProperty>
 {
-    private readonly static Func<CustomProperty, string> _keySelector = v => v.Name;
+    private static readonly Func<CustomProperty, string> _keySelector = v => v.Name;
 
     public CustomPropertiesCollection() : base(_keySelector)
     {
diff --git a/src/Persistence/Collections/CustomPropertyParametersCollection.cs b/src/Persistence/Collections/CustomPropertyParametersCollection.cs
index de87ecf5..b44239b2 100644
--- a/src/Persistence/Collections/CustomPropertyParametersCollection.cs
+++ b/src/Persistence/Collections/CustomPropertyParametersCollection.cs
@@ -7,7 +7,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Collections;
 
 public class CustomPropertyParametersCollection : NamedItemsCollection<CustomPropertyParameter>
 {
-    private readonly static Func<CustomPropertyParameter, string> _keySelector = v => v.Name;
+    private static readonly Func<CustomPropertyParameter, string> _keySelector = v => v.Name;
 
     public CustomPropertyParametersCollection() : base(_keySelector)
     {
diff --git a/src/Persistence/Extensions/YamlExtensions.cs b/src/Persistence/Extensions/YamlExtensions.cs
index 19d2999d..0c57e604 100644
--- a/src/Persistence/Extensions/YamlExtensions.cs
+++ b/src/Persistence/Extensions/YamlExtensions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.Extensions;
 
 public static class YamlExtensions
 {
-    static internal readonly char[] LineTerminators = new char[] { '\r', '\n', '\x85', '\x2028', '\x2029' };
+    internal static readonly char[] LineTerminators = new char[] { '\r', '\n', '\x85', '\x2028', '\x2029' };
 
     public static ScalarStyle DetermineScalarStyleForProperty(this string? property)
     {
diff --git a/src/Persistence/PaYaml/Models/NamedObjectMapping.cs b/src/Persistence/PaYaml/Models/NamedObjectMapping.cs
index 5fa2763b..b0ba4a99 100644
--- a/src/Persistence/PaYaml/Models/NamedObjectMapping.cs
+++ b/src/Persistence/PaYaml/Models/NamedObjectMapping.cs
@@ -13,7 +13,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.PaYaml.Models;
 public class NamedObjectMapping<TValue> : NamedObjectMappingBase<string, TValue, NamedObject<TValue>>, INamedObjectCollection<TValue>
     where TValue : notnull
 {
-    private readonly static StringComparer DefaultComparer = StringComparer.Ordinal;
+    private static readonly StringComparer DefaultComparer = StringComparer.Ordinal;
 
     public NamedObjectMapping()
         : this(DefaultComparer)
diff --git a/src/Persistence/PaYaml/Models/NamedObjectSequence.cs b/src/Persistence/PaYaml/Models/NamedObjectSequence.cs
index 71775895..78553546 100644
--- a/src/Persistence/PaYaml/Models/NamedObjectSequence.cs
+++ b/src/Persistence/PaYaml/Models/NamedObjectSequence.cs
@@ -9,7 +9,7 @@ namespace Microsoft.PowerPlatform.PowerApps.Persistence.PaYaml.Models;
 public class NamedObjectSequence<TValue> : NamedObjectSequenceBase<string, TValue, NamedObject<TValue>>, INamedObjectCollection<TValue>
     where TValue : notnull
 {
-    private readonly static StringComparer DefaultComparer = StringComparer.Ordinal;
+    private static readonly StringComparer DefaultComparer = StringComparer.Ordinal;
 
     public NamedObjectSequence()
         : this(DefaultComparer)