diff --git a/src/modeler/AutoRest.Swagger/Model/ServiceDefinition.cs b/src/modeler/AutoRest.Swagger/Model/ServiceDefinition.cs
index df5f0c4c64..4559b1a782 100644
--- a/src/modeler/AutoRest.Swagger/Model/ServiceDefinition.cs
+++ b/src/modeler/AutoRest.Swagger/Model/ServiceDefinition.cs
@@ -94,6 +94,7 @@ public ServiceDefinition()
 
         /// <summary>
         /// Key is the object serviceTypeName and the value is swagger definition.
+        /// <summary>
         [Rule(typeof(BooleanPropertyNotRecommended))]
         [Rule(typeof(ResourceModelValidation))]
         [Rule(typeof(TrackedResourceValidation))]
diff --git a/src/modeler/AutoRest.Swagger/Validation/BooleanPropertyNotRecommended.cs b/src/modeler/AutoRest.Swagger/Validation/BooleanPropertyNotRecommended.cs
index 8be6e94195..10f1f32ae9 100644
--- a/src/modeler/AutoRest.Swagger/Validation/BooleanPropertyNotRecommended.cs
+++ b/src/modeler/AutoRest.Swagger/Validation/BooleanPropertyNotRecommended.cs
@@ -31,22 +31,20 @@ public class BooleanPropertyNotRecommended : TypedRule<Dictionary<string, Schema
         /// Validates whether properties of type boolean exist.
         /// </summary>
         /// <param name="definitions">Operation Definition to validate</param>
-        /// <returns>true if there are propeties of type boolean, false otherwise.</returns>
+        /// <returns>true if there are no propeties of type boolean, false otherwise.</returns>
         public override bool IsValid(Dictionary<string, Schema> definitions, RuleContext context, out object[] formatParameters)
         {
             formatParameters = null;
             List<string> booleanProperties = new List<string>();
-            foreach (string key in definitions.Keys)
+            foreach (KeyValuePair<string, Schema> definition in definitions)
             {
-                Schema definitionSchema = definitions.GetValueOrNull(key);
-                if (definitionSchema.Properties != null)
+                if (definition.Value?.Properties != null)
                 {
-                    foreach (var property in definitionSchema.Properties)
+                    foreach (KeyValuePair<string, Schema> property in definition.Value.Properties)
                     {
                         if (property.Value.Type.ToString().ToLower().Equals("boolean"))
                         {
-                            booleanProperties.Add(key + "/" + property.Key);
-
+                            booleanProperties.Add(definition.Key + "/" + property.Key);
                         }
                     }
                 }