diff --git a/yaml/com/google/gbmc/Hoth.errors.yaml b/yaml/com/google/gbmc/Hoth.errors.yaml
index 76b4d7a..0b61989 100644
--- a/yaml/com/google/gbmc/Hoth.errors.yaml
+++ b/yaml/com/google/gbmc/Hoth.errors.yaml
@@ -5,7 +5,8 @@
 - name: FirmwareFailure
   description: Failed to send firmware update to Hoth.
 - name: ResponseNotFound
-  description: Could not find a response. The command may not have completed yet.
+  description:
+      Could not find a response. The command may not have completed yet.
 - name: InterfaceError
   description: A system error occured with the Hoth interface.
 - name: ExpectedInfoNotFound
diff --git a/yaml/com/google/gbmc/Hoth.interface.yaml b/yaml/com/google/gbmc/Hoth.interface.yaml
index 429f01d..685f745 100644
--- a/yaml/com/google/gbmc/Hoth.interface.yaml
+++ b/yaml/com/google/gbmc/Hoth.interface.yaml
@@ -4,10 +4,10 @@
 methods:
     - name: SendHostCommand
       description: >
-          Send a host command to Hoth and return the response.
-          This will block on Hoth completing its internal operations.
-          Critical host commands like LoadTokens are banned.
-          This method should be called from the IPMI HostCommand passthrough.
+          Send a host command to Hoth and return the response. This will block
+          on Hoth completing its internal operations. Critical host commands
+          like LoadTokens are banned. This method should be called from the IPMI
+          HostCommand passthrough.
       parameters:
           - name: Command
             type: array[byte]
@@ -26,10 +26,10 @@
 
     - name: SendTrustedHostCommand
       description: >
-          Send a host command to Hoth and return the response.
-          This will block on Hoth completing its internal operations.
-          Critical host commands like LoadTokens are allowed.
-          This method should be called from the BMC.
+          Send a host command to Hoth and return the response. This will block
+          on Hoth completing its internal operations. Critical host commands
+          like LoadTokens are allowed. This method should be called from the
+          BMC.
       parameters:
           - name: Command
             type: array[byte]
@@ -104,9 +104,9 @@
 
     - name: InitiatePayload
       description: >
-          Initiates erasure of the EEPROM staging area. Note that this will lock up
-          access to Hoth for an extended time and may go over the kernel's SPI
-          write timeout. Calling multiple small ErasePayload is recommended.
+          Initiates erasure of the EEPROM staging area. Note that this will lock
+          up access to Hoth for an extended time and may go over the kernel's
+          SPI write timeout. Calling multiple small ErasePayload is recommended.
       errors:
           - self.Error.CommandFailure
           - self.Error.ResponseFailure
@@ -177,14 +177,14 @@
 
     - name: ActivatePayload
       description: >
-          Activates the staging area as persistent or non-persistent for next boot
-          if verification was successful.
+          Activates the staging area as persistent or non-persistent for next
+          boot if verification was successful.
       parameters:
           - name: MakePersistent
             type: boolean
             description: >
-                Flag to determine whether to activate the staged image as persistent
-                or non-persistent for next boot.
+                Flag to determine whether to activate the staged image as
+                persistent or non-persistent for next boot.
       errors:
           - self.Error.CommandFailure
           - self.Error.ResponseFailure
@@ -205,8 +205,8 @@
 
     - name: Confirm
       description: >
-          Prevents hoth from rolling back and using the previous image.
-          When an image can be comfirmed to be working well, this command is given,
+          Prevents hoth from rolling back and using the previous image. When an
+          image can be comfirmed to be working well, this command is given,
           which disarms the hoth watchdog.
       errors:
           - self.Error.CommandFailure
@@ -227,8 +227,8 @@
 
     - name: GetFirmwareUpdateTime
       description: >
-          Get time spending in the self update routine. Since a proper self update
-          involves a reset, this time is always expected to be low.
+          Get time spending in the self update routine. Since a proper self
+          update involves a reset, this time is always expected to be low.
       returns:
           - name: Time
             type: uint32
@@ -240,8 +240,8 @@
 
     - name: GetFirmwareMirroringTime
       description: >
-          Get time spending in mirroing the self-update. This time is a reasonable
-          proxy for the total self update time.
+          Get time spending in mirroing the self-update. This time is a
+          reasonable proxy for the total self update time.
       returns:
           - name: Time
             type: uint32
@@ -253,8 +253,8 @@
 
     - name: GetPayloadValidationTime
       description: >
-          Get time spending in validating the payload, copying mutable regions and/or
-          dealing with failsafe fallback.
+          Get time spending in validating the payload, copying mutable regions
+          and/or dealing with failsafe fallback.
       returns:
           - name: Time
             type: uint32
diff --git a/yaml/com/ibm/Dump/Create.interface.yaml b/yaml/com/ibm/Dump/Create.interface.yaml
index 847b64a..80147c0 100644
--- a/yaml/com/ibm/Dump/Create.interface.yaml
+++ b/yaml/com/ibm/Dump/Create.interface.yaml
@@ -1,7 +1,7 @@
 description: >
-    Implement this to pass additional parameters to the create dump.
-    Each required parameter for the dump in the ibm domain should be added
-    here as an enum.
+    Implement this to pass additional parameters to the create dump. Each
+    required parameter for the dump in the ibm domain should be added here as an
+    enum.
 
 enumerations:
     - name: CreateParameters
@@ -10,11 +10,10 @@
       values:
           - name: "VSPString"
             description: >
-                The resouce dump is collected from various host resources.
-                The resource to collect the dump is indicated by using the
-                resource selector.
-                The resource selector string needs to be passed to host to
-                generate a resource dump.
+                The resouce dump is collected from various host resources. The
+                resource to collect the dump is indicated by using the resource
+                selector. The resource selector string needs to be passed to
+                host to generate a resource dump.
           - name: "Password"
             description: >
                 The password for authenticating the resource dump request.
diff --git a/yaml/com/ibm/Dump/Entry/Hardware.interface.yaml b/yaml/com/ibm/Dump/Entry/Hardware.interface.yaml
index fd9ac4b..9053cee 100644
--- a/yaml/com/ibm/Dump/Entry/Hardware.interface.yaml
+++ b/yaml/com/ibm/Dump/Entry/Hardware.interface.yaml
@@ -1,7 +1,7 @@
 description: >
     Implement this to add Hardware dump management.
 
-    Hardware dump is a collection hardware state information,
-    including various registers, and it is used for debugging
-    system checkstop. checkstop is the descriptive term for
-    entire system termination by the hardware due to a detected error.
+    Hardware dump is a collection hardware state information, including various
+    registers, and it is used for debugging system checkstop. checkstop is the
+    descriptive term for entire system termination by the hardware due to a
+    detected error.
diff --git a/yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml b/yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml
index da8a0f6..f2b5f2f 100644
--- a/yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml
+++ b/yaml/com/ibm/Dump/Entry/Hostboot.interface.yaml
@@ -1,6 +1,5 @@
 description: >
     Implement this to add Hostboot dump management.
 
-    Hostboot dump collects memory and hardware states
-    in the case of a failure during hostboot booting
-    phase.
+    Hostboot dump collects memory and hardware states in the case of a failure
+    during hostboot booting phase.
diff --git a/yaml/com/ibm/Dump/Entry/Resource.interface.yaml b/yaml/com/ibm/Dump/Entry/Resource.interface.yaml
index 17a38d9..ffedff4 100644
--- a/yaml/com/ibm/Dump/Entry/Resource.interface.yaml
+++ b/yaml/com/ibm/Dump/Entry/Resource.interface.yaml
@@ -1,20 +1,19 @@
 description: >
     Implement this to add Resource dump management.
 
-    The resource dumps are special types of dumps
-    generated by host hypervisor. The dump is generated
-    based on the resource selector. Hyperviosr needs
-    a password to validate the request before creating the dump.
+    The resource dumps are special types of dumps generated by host hypervisor.
+    The dump is generated based on the resource selector. Hyperviosr needs a
+    password to validate the request before creating the dump.
 
 properties:
     - name: SourceDumpId
       type: uint32
       description: >
-          The dump id provided by the source of the dump.
-          There are dumps which get generated outside the BMC, like a
-          resource dump which gets generated and stored in the host memory.
-          All dumps will have a unique id but when communicating
-          to the source of the dump the SourceDumpId will be used.
+          The dump id provided by the source of the dump. There are dumps which
+          get generated outside the BMC, like a resource dump which gets
+          generated and stored in the host memory. All dumps will have a unique
+          id but when communicating to the source of the dump the SourceDumpId
+          will be used.
     - name: VSPString
       type: string
       description: >
diff --git a/yaml/com/ibm/Logging/Policy.interface.yaml b/yaml/com/ibm/Logging/Policy.interface.yaml
index 2dc6d05..8b971e7 100644
--- a/yaml/com/ibm/Logging/Policy.interface.yaml
+++ b/yaml/com/ibm/Logging/Policy.interface.yaml
@@ -4,8 +4,8 @@
     - name: EventID
       type: string
       description: >
-          This ID is defined by IBM service to uniquely identify an error
-          in the service documentation.
+          This ID is defined by IBM service to uniquely identify an error in the
+          service documentation.
     - name: Description
       type: string
       description: >
diff --git a/yaml/com/ibm/VPD.errors.yaml b/yaml/com/ibm/VPD.errors.yaml
index a69e8c1..da408f0 100644
--- a/yaml/com/ibm/VPD.errors.yaml
+++ b/yaml/com/ibm/VPD.errors.yaml
@@ -9,16 +9,14 @@
 - name: KeywordNotFound
   description: Keyword is not found.
 - name: BlankSystemVPD
-  description: System VPD is blank on both hardware and cache.
-      On IBM systems, certain VPD data must be available
-      for the system to boot. This error is used to
+  description:
+      System VPD is blank on both hardware and cache. On IBM systems, certain
+      VPD data must be available for the system to boot. This error is used to
       indicate that no valid data was found by the BMC.
 - name: InvalidEepromPath
-  description: EEPROM path is invalid. Parser failed to access the
-      path.
+  description: EEPROM path is invalid. Parser failed to access the path.
 - name: InvalidVPD
-  description: VPD file is not valid. Mandatory records are missing
-      in VPD file.
+  description: VPD file is not valid. Mandatory records are missing in VPD file.
 - name: EccCheckFailed
   desciption: Invalid VPD data. Ecc check for the data failed.
 - name: InvalidJson
diff --git a/yaml/com/ibm/VPD/Manager.interface.yaml b/yaml/com/ibm/VPD/Manager.interface.yaml
index 2dfae1b..8d1409d 100644
--- a/yaml/com/ibm/VPD/Manager.interface.yaml
+++ b/yaml/com/ibm/VPD/Manager.interface.yaml
@@ -29,8 +29,8 @@
 
     - name: GetFRUsByUnexpandedLocationCode
       description: >
-          A method to get list of FRU D-BUS object paths for a given
-          unexpanded location code.
+          A method to get list of FRU D-BUS object paths for a given unexpanded
+          location code.
       parameters:
           - name: locationCode
             type: string
@@ -39,8 +39,8 @@
           - name: nodeNumber
             type: uint16
             description: >
-                Denotes the node in case of a multi-node configuration,
-                ignored on a single node system.
+                Denotes the node in case of a multi-node configuration, ignored
+                on a single node system.
       returns:
           - name: inventoryList
             type: array[object_path]
@@ -75,8 +75,8 @@
     - name: GetExpandedLocationCode
       description: >
           An api to get expanded location code corresponding to a given
-          un-expanded location code.
-          Expanded location codes gives the location of the FRU in the system.
+          un-expanded location code. Expanded location codes gives the location
+          of the FRU in the system.
       parameters:
           - name: locationCode
             type: string
@@ -85,8 +85,8 @@
           - name: nodeNumber
             type: uint16
             description: >
-                Denotes the node in case of multi-node configuration.
-                Ignored in case of single node configuration.
+                Denotes the node in case of multi-node configuration. Ignored in
+                case of single node configuration.
       returns:
           - name: locationCode
             type: string
diff --git a/yaml/com/ibm/ipzvpd/CP00.interface.yaml b/yaml/com/ibm/ipzvpd/CP00.interface.yaml
index bbc5652..9016512 100644
--- a/yaml/com/ibm/ipzvpd/CP00.interface.yaml
+++ b/yaml/com/ibm/ipzvpd/CP00.interface.yaml
@@ -32,8 +32,7 @@
     - name: PZ
       type: array[byte]
       description: >
-          PZ keyword.On Chip Precision Voltage Reference,
-          PVREF.
+          PZ keyword.On Chip Precision Voltage Reference, PVREF.
     - name: AW
       type: array[byte]
       description: >
diff --git a/yaml/com/ibm/ipzvpd/CRP0.interface.yaml b/yaml/com/ibm/ipzvpd/CRP0.interface.yaml
index 558c450..c5d2a91 100644
--- a/yaml/com/ibm/ipzvpd/CRP0.interface.yaml
+++ b/yaml/com/ibm/ipzvpd/CRP0.interface.yaml
@@ -44,8 +44,7 @@
     - name: PD_W
       type: array[byte]
       description: >
-          The "#W" keyword.DDS configuration and calibration
-          settings.
+          The "#W" keyword.DDS configuration and calibration settings.
     - name: PD_V
       type: array[byte]
       description: >
diff --git a/yaml/com/ibm/ipzvpd/Location.interface.yaml b/yaml/com/ibm/ipzvpd/Location.interface.yaml
index c64e7a8..5244db8 100644
--- a/yaml/com/ibm/ipzvpd/Location.interface.yaml
+++ b/yaml/com/ibm/ipzvpd/Location.interface.yaml
@@ -4,5 +4,5 @@
     - name: LocationCode
       type: string
       description: >
-          A string describing the physical location of the FRU.
-          The location is determined based on the system design.
+          A string describing the physical location of the FRU. The location is
+          determined based on the system design.
diff --git a/yaml/com/ibm/ipzvpd/README.md b/yaml/com/ibm/ipzvpd/README.md
index 6604577..839a114 100644
--- a/yaml/com/ibm/ipzvpd/README.md
+++ b/yaml/com/ibm/ipzvpd/README.md
@@ -1,12 +1,12 @@
 # IPZ VPD D-Bus Interfaces
 
-IPZ is a VPD (Vital Product Data) format used in IBM Power systems.
-The format consists of keywords that are stored as key-value
-pairs (Keyword name and its value). Keywords are grouped into records,
-usually with similar function grouped into a single record.
+IPZ is a VPD (Vital Product Data) format used in IBM Power systems. The format
+consists of keywords that are stored as key-value pairs (Keyword name and its
+value). Keywords are grouped into records, usually with similar function grouped
+into a single record.
 
-The [OpenPower VPD] [1] format is quite similar to the IPZ format
-and describes the record-keyword structure.
+The [OpenPower VPD] [1] format is quite similar to the IPZ format and describes
+the record-keyword structure.
 
 Also refer to the [VPD Collection design document] [2] that describes how the
 VPD collection application on the BMC will parse and publish the VPD data for
@@ -14,8 +14,9 @@
 
 The D-Bus interfaces defined here describe how IPZ VPD will be made available on
 D-Bus. Each YAML here represents a record in the IPZ VPD and keywords that
-belong to that record are represented as properties under that interface.
-The type of every property shall be a byte array.
+belong to that record are represented as properties under that interface. The
+type of every property shall be a byte array.
 
-[1]: https://www-355.ibm.com/systems/power/openpower/posting.xhtml?postingId=1D060729AC96891885257E1B0053BC95
+[1]:
+  https://www-355.ibm.com/systems/power/openpower/posting.xhtml?postingId=1D060729AC96891885257E1B0053BC95
 [2]: https://github.com/openbmc/docs/blob/master/designs/vpd-collection.md
diff --git a/yaml/com/ibm/ipzvpd/VER0.interface.yaml b/yaml/com/ibm/ipzvpd/VER0.interface.yaml
index 1c0d3c8..413a6ea 100644
--- a/yaml/com/ibm/ipzvpd/VER0.interface.yaml
+++ b/yaml/com/ibm/ipzvpd/VER0.interface.yaml
@@ -1,6 +1,6 @@
 description: >
-    Implement to represent the VER0 record (contains vendor repair data)
-    in IPZ VPD
+    Implement to represent the VER0 record (contains vendor repair data) in IPZ
+    VPD
 properties:
     - name: RT
       type: array[byte]
diff --git a/yaml/com/intel/Control/NMISource.interface.yaml b/yaml/com/intel/Control/NMISource.interface.yaml
index a172159..5d95eff 100644
--- a/yaml/com/intel/Control/NMISource.interface.yaml
+++ b/yaml/com/intel/Control/NMISource.interface.yaml
@@ -5,7 +5,7 @@
       type: enum[self.BMCSourceSignal]
       description: >
           Keeps track of NMI signal source in BMC.
-      default: 'None'
+      default: "None"
     - name: Enabled
       type: boolean
       description: >
@@ -13,34 +13,34 @@
       default: true
 
 enumerations:
-   - name: BMCSourceSignal
-     description: >
-       The type of NMI source.
-     values:
-       - name: None
-         description: >
-           NONE NMI signal.
-       - name: FpBtn
-         description: >
-           Via Front Panel NMI button.
-       - name: WdPreTimeout
-         description: >
-           Via watchdog pre-timeout.
-       - name: PefMatch
-         description: >
-           Via PEF match.
-       - name: ChassisCmd
-         description: >
-           Via Chassis command.
-       - name: MemoryError
-         description: >
-           Via memory error.
-       - name: PciSerrPerr
-         description: >
-           Via PCI SERR PERR.
-       - name: SouthbridgeNmi
-         description: >
-           Via southbridge NMI.
-       - name: ChipsetNmi
-         description: >
-           Via chipset NMI.
+    - name: BMCSourceSignal
+      description: >
+          The type of NMI source.
+      values:
+          - name: None
+            description: >
+                NONE NMI signal.
+          - name: FpBtn
+            description: >
+                Via Front Panel NMI button.
+          - name: WdPreTimeout
+            description: >
+                Via watchdog pre-timeout.
+          - name: PefMatch
+            description: >
+                Via PEF match.
+          - name: ChassisCmd
+            description: >
+                Via Chassis command.
+          - name: MemoryError
+            description: >
+                Via memory error.
+          - name: PciSerrPerr
+            description: >
+                Via PCI SERR PERR.
+          - name: SouthbridgeNmi
+            description: >
+                Via southbridge NMI.
+          - name: ChipsetNmi
+            description: >
+                Via chipset NMI.
diff --git a/yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml b/yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml
index ccbb6e2..86d239e 100644
--- a/yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml
+++ b/yaml/com/intel/Control/OCOTShutdownPolicy.interface.yaml
@@ -1,24 +1,23 @@
 description: >
-    An interface for node shutdown policy on multi-node products.
-    It is used by Intel OEM IPMI command.
+    An interface for node shutdown policy on multi-node products. It is used by
+    Intel OEM IPMI command.
 properties:
     - name: OCOTPolicy
       type: enum[self.Policy]
       description: >
-          Node shutdown policy on a power supply over current(OC)
-          or over temperature(OT) event,
-          Only available on multi-node products.
+          Node shutdown policy on a power supply over current(OC) or over
+          temperature(OT) event, Only available on multi-node products.
 
-      default: 'NoShutdownOnOCOT'
+      default: "NoShutdownOnOCOT"
 
 enumerations:
-   - name: Policy
-     description: >
-       The type of shutdown policy.
-     values:
-       - name: 'NoShutdownOnOCOT'
-         description: >
-           Do not shutdown node on an OC/OT event.
-       - name: 'ShutdownOnOCOT'
-         description: >
-           Shutdown node on an OC/OT event.
\ No newline at end of file
+    - name: Policy
+      description: >
+          The type of shutdown policy.
+      values:
+          - name: "NoShutdownOnOCOT"
+            description: >
+                Do not shutdown node on an OC/OT event.
+          - name: "ShutdownOnOCOT"
+            description: >
+                Shutdown node on an OC/OT event.
diff --git a/yaml/com/intel/Protocol/PECI/Raw.interface.yaml b/yaml/com/intel/Protocol/PECI/Raw.interface.yaml
index f2fdb34..60adf89 100644
--- a/yaml/com/intel/Protocol/PECI/Raw.interface.yaml
+++ b/yaml/com/intel/Protocol/PECI/Raw.interface.yaml
@@ -21,5 +21,5 @@
             type: array[array[byte]]
             description: >
                 An array of byte arrays where each byte array holds the raw
-                bytes for a single PECI response corresponding to the command
-                in the command array.
+                bytes for a single PECI response corresponding to the command in
+                the command array.