diff --git a/definitions/3.0.0/multiFormatSchema.json b/definitions/3.0.0/multiFormatSchema.json
index d4047bb0..817369e5 100644
--- a/definitions/3.0.0/multiFormatSchema.json
+++ b/definitions/3.0.0/multiFormatSchema.json
@@ -1,227 +1,217 @@
 {
   "description": "The Multi Format Schema Object represents a schema definition. It differs from the Schema Object in that it supports multiple schema formats or languages (e.g., JSON Schema, Avro, etc.).",
-  "if": {
-    "not": {
-      "type": "object"
+  "type": "object",
+  "additionalProperties": false,
+  "patternProperties": {
+    "^x-[\\w\\d\\.\\x2d_]+$": {
+      "$ref": "http://asyncapi.com/definitions/3.0.0/specificationExtension.json"
     }
   },
-  "then": {
-    "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
+  "properties": {
+    "schemaFormat": {
+      "description": "A string containing the name of the schema format that is used to define the information. If schemaFormat is missing, it MUST default to application/vnd.aai.asyncapi+json;version={{asyncapi}} where {{asyncapi}} matches the AsyncAPI Version String. In such a case, this would make the Multi Format Schema Object equivalent to the Schema Object. When using Reference Object within the schema, the schemaFormat of the resource being referenced MUST match the schemaFormat of the schema that contains the initial reference. For example, if you reference Avro schema, then schemaFormat of referencing resource and the resource being reference MUST match.",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "description": "All the schema formats tooling MUST support",
+          "enum": [
+            "application/schema+json;version=draft-07",
+            "application/schema+yaml;version=draft-07",
+
+            "application/vnd.aai.asyncapi;version=3.0.0",
+            "application/vnd.aai.asyncapi+json;version=3.0.0",
+            "application/vnd.aai.asyncapi+yaml;version=3.0.0"
+          ]
+        },
+        {
+          "description": "All the schema formats tools are RECOMMENDED to support",
+          "enum": [
+            "application/vnd.oai.openapi;version=3.0.0", 
+            "application/vnd.oai.openapi+json;version=3.0.0", 
+            "application/vnd.oai.openapi+yaml;version=3.0.0",
+
+            "application/vnd.apache.avro;version=1.9.0",
+            "application/vnd.apache.avro+json;version=1.9.0",
+            "application/vnd.apache.avro+yaml;version=1.9.0",
+            
+            "application/raml+yaml;version=1.0"
+          ]
+        }
+      ]
+    },
+    "schema": {
+      "description": "Definition of the message payload. It can be of any type but defaults to Schema Object. It MUST match the schema format defined in schemaFormat, including the encoding type. E.g., Avro should be inlined as either a YAML or JSON object instead of as a string to be parsed as YAML or JSON. Non-JSON-based schemas (e.g., Protobuf or XSD) MUST be inlined as a string."
+    }
   },
-  "else": {
-    "type": "object",
-    "additionalProperties": false,
-    "patternProperties": {
-      "^x-[\\w\\d\\.\\x2d_]+$": {
-        "$ref": "http://asyncapi.com/definitions/3.0.0/specificationExtension.json"
+  "allOf": [
+    {
+      "if": {
+        "not": {
+          "description": "If no schemaFormat has been defined, default to schema or reference",
+          "required": [
+            "schemaFormat"
+          ]
+        }
+      },
+      "then": {
+        "properties": {
+          "schema": {
+            "oneOf": [
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
+              },
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
+              }
+            ]
+          }
+        }
       }
     },
-    "properties": {
-      "schemaFormat": {
-        "description": "A string containing the name of the schema format that is used to define the information. If schemaFormat is missing, it MUST default to application/vnd.aai.asyncapi+json;version={{asyncapi}} where {{asyncapi}} matches the AsyncAPI Version String. In such a case, this would make the Multi Format Schema Object equivalent to the Schema Object. When using Reference Object within the schema, the schemaFormat of the resource being referenced MUST match the schemaFormat of the schema that contains the initial reference. For example, if you reference Avro schema, then schemaFormat of referencing resource and the resource being reference MUST match.",
-        "anyOf": [
-          {
-            "type": "string"
-          },
-          {
-            "description": "All the schema formats tooling MUST support",
+    {
+      "if": {
+        "description": "If schemaFormat has been defined check if it's one of the AsyncAPI Schema Object formats",
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
             "enum": [
-              "application/schema+json;version=draft-07",
-              "application/schema+yaml;version=draft-07",
-
+              "application/vnd.aai.asyncapi;version=2.0.0",
+              "application/vnd.aai.asyncapi+json;version=2.0.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.0.0",
+              "application/vnd.aai.asyncapi;version=2.1.0",
+              "application/vnd.aai.asyncapi+json;version=2.1.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.1.0",
+              "application/vnd.aai.asyncapi;version=2.2.0",
+              "application/vnd.aai.asyncapi+json;version=2.2.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.2.0",
+              "application/vnd.aai.asyncapi;version=2.3.0",
+              "application/vnd.aai.asyncapi+json;version=2.3.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.3.0",
+              "application/vnd.aai.asyncapi;version=2.4.0",
+              "application/vnd.aai.asyncapi+json;version=2.4.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.4.0",
+              "application/vnd.aai.asyncapi;version=2.5.0",
+              "application/vnd.aai.asyncapi+json;version=2.5.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.5.0",
+              "application/vnd.aai.asyncapi;version=2.6.0",
+              "application/vnd.aai.asyncapi+json;version=2.6.0",
+              "application/vnd.aai.asyncapi+yaml;version=2.6.0",
               "application/vnd.aai.asyncapi;version=3.0.0",
               "application/vnd.aai.asyncapi+json;version=3.0.0",
               "application/vnd.aai.asyncapi+yaml;version=3.0.0"
             ]
-          },
-          {
-            "description": "All the schema formats tools are RECOMMENDED to support",
-            "enum": [
-              "application/vnd.oai.openapi;version=3.0.0", 
-              "application/vnd.oai.openapi+json;version=3.0.0", 
-              "application/vnd.oai.openapi+yaml;version=3.0.0",
-  
-              "application/vnd.apache.avro;version=1.9.0",
-              "application/vnd.apache.avro+json;version=1.9.0",
-              "application/vnd.apache.avro+yaml;version=1.9.0",
-              
-              "application/raml+yaml;version=1.0"
-            ]
           }
-        ]
+        }
       },
-      "schema": {
-        "description": "Definition of the message payload. It can be of any type but defaults to Schema Object. It MUST match the schema format defined in schemaFormat, including the encoding type. E.g., Avro should be inlined as either a YAML or JSON object instead of as a string to be parsed as YAML or JSON. Non-JSON-based schemas (e.g., Protobuf or XSD) MUST be inlined as a string."
+      "then": {
+        "properties": {
+          "schema": {
+            "oneOf": [
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
+              },
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
+              }
+            ]
+          }
+        }
       }
     },
-    "allOf": [
-      {
-        "if": {
-          "not": {
-            "description": "If no schemaFormat has been defined, default to schema or reference",
-            "required": [
-              "schemaFormat"
+    {
+      "if": {
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
+            "enum": [
+              "application/schema+json;version=draft-07",
+              "application/schema+yaml;version=draft-07"
             ]
           }
-        },
-        "then": {
-          "properties": {
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
-                }
-              ]
-            }
-          }
         }
       },
-      {
-        "if": {
-          "description": "If schemaFormat has been defined check if it's one of the AsyncAPI Schema Object formats",
-          "required": [
-            "schemaFormat"
-          ],
-          "properties": {
-            "schemaFormat": {
-              "enum": [
-                "application/vnd.aai.asyncapi;version=2.0.0",
-                "application/vnd.aai.asyncapi+json;version=2.0.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.0.0",
-                "application/vnd.aai.asyncapi;version=2.1.0",
-                "application/vnd.aai.asyncapi+json;version=2.1.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.1.0",
-                "application/vnd.aai.asyncapi;version=2.2.0",
-                "application/vnd.aai.asyncapi+json;version=2.2.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.2.0",
-                "application/vnd.aai.asyncapi;version=2.3.0",
-                "application/vnd.aai.asyncapi+json;version=2.3.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.3.0",
-                "application/vnd.aai.asyncapi;version=2.4.0",
-                "application/vnd.aai.asyncapi+json;version=2.4.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.4.0",
-                "application/vnd.aai.asyncapi;version=2.5.0",
-                "application/vnd.aai.asyncapi+json;version=2.5.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.5.0",
-                "application/vnd.aai.asyncapi;version=2.6.0",
-                "application/vnd.aai.asyncapi+json;version=2.6.0",
-                "application/vnd.aai.asyncapi+yaml;version=2.6.0",
-                "application/vnd.aai.asyncapi;version=3.0.0",
-                "application/vnd.aai.asyncapi+json;version=3.0.0",
-                "application/vnd.aai.asyncapi+yaml;version=3.0.0"
-              ]
-            }
-          }
-        },
-        "then": {
-          "properties": {
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/schema.json"
-                }
-              ]
-            }
+      "then": {
+        "properties": {
+          "schema": {
+            "oneOf": [
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
+              },
+              {
+                "$ref": "http://json-schema.org/draft-07/schema"
+              }
+            ]
           }
         }
-      },
-      {
-        "if": {
-          "required": [
-            "schemaFormat"
-          ],
-          "properties": {
-            "schemaFormat": {
-              "enum": [
-                "application/schema+json;version=draft-07",
-                "application/schema+yaml;version=draft-07"
-              ]
-            }
-          }
-        },
-        "then": {
-          "properties": {
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://json-schema.org/draft-07/schema"
-                }
-              ]
-            }
+      }
+    },
+    {
+      "if": {
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
+            "enum": [
+              "application/vnd.oai.openapi;version=3.0.0",
+              "application/vnd.oai.openapi+json;version=3.0.0",
+              "application/vnd.oai.openapi+yaml;version=3.0.0"
+            ]
           }
         }
       },
-      {
-        "if": {
-          "required": [
-            "schemaFormat"
-          ],
-          "properties": {
-            "schemaFormat": {
-              "enum": [
-                "application/vnd.oai.openapi;version=3.0.0",
-                "application/vnd.oai.openapi+json;version=3.0.0",
-                "application/vnd.oai.openapi+yaml;version=3.0.0"
-              ]
-            }
+      "then": {
+        "properties": {
+          "schema": {
+            "oneOf": [
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
+              },
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/openapiSchema_3_0.json"
+              }
+            ]
           }
-        },
-        "then": {
-          "properties": {
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/openapiSchema_3_0.json"
-                }
-              ]
-            }
+        }
+      }
+    },
+    {
+      "if": {
+        "required": [
+          "schemaFormat"
+        ],
+        "properties": {
+          "schemaFormat": {
+            "enum": [
+              "application/vnd.apache.avro;version=1.9.0",
+              "application/vnd.apache.avro+json;version=1.9.0",
+              "application/vnd.apache.avro+yaml;version=1.9.0"
+            ]
           }
         }
       },
-      {
-        "if": {
-          "required": [
-            "schemaFormat"
-          ],
-          "properties": {
-            "schemaFormat": {
-              "enum": [
-                "application/vnd.apache.avro;version=1.9.0",
-                "application/vnd.apache.avro+json;version=1.9.0",
-                "application/vnd.apache.avro+yaml;version=1.9.0"
-              ]
-            }
-          }
-        },
-        "then": {
-          "properties": {
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
-                },
-                {
-                  "$ref": "http://asyncapi.com/definitions/3.0.0/avroSchema_v1.json"
-                }
-              ]
-            }
+      "then": {
+        "properties": {
+          "schema": {
+            "oneOf": [
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/Reference.json"
+              },
+              {
+                "$ref": "http://asyncapi.com/definitions/3.0.0/avroSchema_v1.json"
+              }
+            ]
           }
         }
       }
-    ]
-  },
+    }
+  ],
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://asyncapi.com/definitions/3.0.0/multiFormatSchema.json"
 }
\ No newline at end of file