diff --git a/yaml/org/freedesktop/UPower/Device.interface.yaml b/yaml/org/freedesktop/UPower/Device.interface.yaml
index 9f13d61..cb1ef82 100644
--- a/yaml/org/freedesktop/UPower/Device.interface.yaml
+++ b/yaml/org/freedesktop/UPower/Device.interface.yaml
@@ -17,50 +17,50 @@
           "Gets history for the power device that is persistent across
            reboots."
       parameters:
-        - name: type
-          type: string
-          description: >
-            "The type of history. Valid types are rate or charge."
-        - name: timespan
-          type: uint32
-          description: >
-            "The amount of data to return in seconds, or 0 for all."
-        - name: resolution
-          type: uint32
-          description: >
-            "The approximate number of points to return. A higher resolution is
-             more accurate, at the expense of plotting speed."
+          - name: type
+            type: string
+            description: >
+                "The type of history. Valid types are rate or charge."
+          - name: timespan
+            type: uint32
+            description: >
+                "The amount of data to return in seconds, or 0 for all."
+          - name: resolution
+            type: uint32
+            description: >
+                "The approximate number of points to return. A higher resolution is
+                 more accurate, at the expense of plotting speed."
       returns:
-        - name: data
-          type: array[struct[uint32, double, uint32]]
-          description: >
-            "The history data for the power device, if the device supports
-             history. Data is ordered from the earliest in time, to the newest
-             data point. Each element contains the following members:
-               time: The time value in seconds from the gettimeofday() method.
-               value: The data value, for instance the rate in W or the charge
-                      in %.
-               state: The state of the device, for instance charging or
-                      discharging."
+          - name: data
+            type: array[struct[uint32, double, uint32]]
+            description: >
+                "The history data for the power device, if the device supports
+                 history. Data is ordered from the earliest in time, to the newest
+                 data point. Each element contains the following members:
+                   time: The time value in seconds from the gettimeofday() method.
+                   value: The data value, for instance the rate in W or the charge
+                          in %.
+                   state: The state of the device, for instance charging or
+                          discharging."
 
     - name: GetStatistics
       description: >
           "Gets statistics for the power device that may be interesting to show
            on a graph in the session."
       parameters:
-        - name: type
-          type: string
-          description: >
-            "The mode for the statistics. Valid types are charging or
-             discharging."
+          - name: type
+            type: string
+            description: >
+                "The mode for the statistics. Valid types are charging or
+                 discharging."
       returns:
-        - name: data
-          type: array[struct[double, double]]
-          description: >
-            "The statistics data for the power device. Each element contains the
-             following members:
-               value: The value of the percentage point, usually in seconds.
-               accuracy: The accuracy of the prediction in percent."
+          - name: data
+            type: array[struct[double, double]]
+            description: >
+                "The statistics data for the power device. Each element contains the
+                 following members:
+                   value: The value of the percentage point, usually in seconds.
+                   accuracy: The accuracy of the prediction in percent."
 
 properties:
     - name: NativePath
diff --git a/yaml/org/open_power/Control/Host.interface.yaml b/yaml/org/open_power/Control/Host.interface.yaml
index ea5e9a1..86dcde1 100644
--- a/yaml/org/open_power/Control/Host.interface.yaml
+++ b/yaml/org/open_power/Control/Host.interface.yaml
@@ -23,33 +23,33 @@
 signals:
     - name: CommandComplete
       description: >
-        Signal indicating that a command has completed
+          Signal indicating that a command has completed
       properties:
-        - name: command
-          type: enum[self.Command]
-          description: Executed command
-        - name: result
-          type: enum[self.Result]
-          description: Result of the command execution
+          - name: command
+            type: enum[self.Command]
+            description: Executed command
+          - name: result
+            type: enum[self.Result]
+            description: Result of the command execution
 
 enumerations:
     - name: Command
       description: >
-        The command to execute against the host
+          The command to execute against the host
       values:
-        - name: OCCReset
-          description: >
-            Host firmware should reset the OCC. This is invoked by
-            OCC error monitor application on detecting the error.
-            Sensor ID of the failing OCC will be sent as data.
-            This command will return once the command has been placed
-            in command Queue.
+          - name: OCCReset
+            description: >
+                Host firmware should reset the OCC. This is invoked by
+                OCC error monitor application on detecting the error.
+                Sensor ID of the failing OCC will be sent as data.
+                This command will return once the command has been placed
+                in command Queue.
 
     - name: Result
       description: >
-        The result of the command execution
+          The result of the command execution
       values:
-        - name: Success
-          description: Command execution was a success
-        - name: Failure
-          description: Command execution was a failure
+          - name: Success
+            description: Command execution was a success
+          - name: Failure
+            description: Command execution was a failure
diff --git a/yaml/org/open_power/Logging/PEL.interface.yaml b/yaml/org/open_power/Logging/PEL.interface.yaml
index bf7deb5..80fd0b1 100644
--- a/yaml/org/open_power/Logging/PEL.interface.yaml
+++ b/yaml/org/open_power/Logging/PEL.interface.yaml
@@ -1,162 +1,161 @@
 description: >
-  Provides D-Bus access to OpenPower Platform Event Logs
+    Provides D-Bus access to OpenPower Platform Event Logs
 methods:
-  - name: GetPEL
-    description: >
-      Returns a file desciptor to a PEL.
-    parameters:
-      - name: pelID
-        type: uint32
-        description: >
-          The PEL log ID of the PEL to retrieve.
-    returns:
-      - name: data
-        type: unixfd
-        description: >
-          A file descriptor for a file that contains the PEL.
-    errors:
-       - xyz.openbmc_project.Common.Error.InternalFailure
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: GetPEL
+      description: >
+          Returns a file desciptor to a PEL.
+      parameters:
+          - name: pelID
+            type: uint32
+            description: >
+                The PEL log ID of the PEL to retrieve.
+      returns:
+          - name: data
+            type: unixfd
+            description: >
+                A file descriptor for a file that contains the PEL.
+      errors:
+          - xyz.openbmc_project.Common.Error.InternalFailure
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
-  - name: GetPELFromOBMCID
-    description: >
-      Returns PEL data based on the OpenBMC event log ID.
-    parameters:
-      - name: obmcLogID
-        type: uint32
-        description: >
-          The OpenBMC event log ID of the PEL to retrieve.
-    returns:
-      - name: data
-        type: array[byte]
-        description: >
-          The PEL data
-    errors:
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: GetPELFromOBMCID
+      description: >
+          Returns PEL data based on the OpenBMC event log ID.
+      parameters:
+          - name: obmcLogID
+            type: uint32
+            description: >
+                The OpenBMC event log ID of the PEL to retrieve.
+      returns:
+          - name: data
+            type: array[byte]
+            description: >
+                The PEL data
+      errors:
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
-  - name: HostAck
-    description: >
-      Notifies the PEL handler that the host (usually the OS) acked a PEL.
-    parameters:
-      - name: pelID
-        type: uint32
-        description: >
-          The PEL log ID
-    errors:
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: HostAck
+      description: >
+          Notifies the PEL handler that the host (usually the OS) acked a PEL.
+      parameters:
+          - name: pelID
+            type: uint32
+            description: >
+                The PEL log ID
+      errors:
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
-  - name: HostReject
-    description: >
-      Notifies the PEL handler that the host could not process a PEL.
-    parameters:
-      - name: pelID
-        type: uint32
-        description: >
-          The PEL log ID
-      - name: reason
-        type: enum[self.RejectionReason]
-        description: >
-          The reason the PEL was rejected
-    errors:
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: HostReject
+      description: >
+          Notifies the PEL handler that the host could not process a PEL.
+      parameters:
+          - name: pelID
+            type: uint32
+            description: >
+                The PEL log ID
+          - name: reason
+            type: enum[self.RejectionReason]
+            description: >
+                The reason the PEL was rejected
+      errors:
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
-  - name: CreatePELWithFFDCFiles
-    description: >
-      Creates an OpenBMC event log and a corresponding PEL. This method
-      returns the IDs of the created PEL and OpenBMC event log, unlike the
-      'xyz.openbmc_project.Logging.Create.CreateWithFFDCFiles' method which
-      doesn't return anything.
-    parameters:
-      - name: Message
-        type: string
-        description: >
-          The Message property of the OpenBMC event log entry.
-          This is also the key into the PEL message registry.
-      - name: Severity
-        type: enum[xyz.openbmc_project.Logging.Entry.Level]
-        description: >
-          The Severity property of the event entry.
-      - name: AdditionalData
-        type: dict[string, string]
-        description: >
-          The AdditionalData property of the event entry.
-          e.g.:
-            {
-              "key1": "value1",
-              "key2": "value2"
-            }
-          ends up in AdditionaData like:
-            ["KEY1=value1", "KEY2=value2"]
-      - name: FFDC
-        type: array[struct[enum[xyz.openbmc_project.Logging.Create.FFDCFormat], byte, byte, unixfd]]
-        description: >
-          File descriptors for any files containing FFDC, along with metadata
-          about the contents:
+    - name: CreatePELWithFFDCFiles
+      description: >
+          Creates an OpenBMC event log and a corresponding PEL. This method
+          returns the IDs of the created PEL and OpenBMC event log, unlike the
+          'xyz.openbmc_project.Logging.Create.CreateWithFFDCFiles' method which
+          doesn't return anything.
+      parameters:
+          - name: Message
+            type: string
+            description: >
+                The Message property of the OpenBMC event log entry.
+                This is also the key into the PEL message registry.
+          - name: Severity
+            type: enum[xyz.openbmc_project.Logging.Entry.Level]
+            description: >
+                The Severity property of the event entry.
+          - name: AdditionalData
+            type: dict[string, string]
+            description: >
+                The AdditionalData property of the event entry.
+                e.g.:
+                  {
+                    "key1": "value1",
+                    "key2": "value2"
+                  }
+                ends up in AdditionaData like:
+                  ["KEY1=value1", "KEY2=value2"]
+          - name: FFDC
+            type: array[struct[enum[xyz.openbmc_project.Logging.Create.FFDCFormat], byte, byte, unixfd]]
+            description: >
+                File descriptors for any files containing FFDC, along with metadata
+                about the contents:
 
-            FFDCFormat- The format type of the contained data.
-            subType - The format subtype, used for the 'Custom' type.
-            version - The version of the data format, used for the 'Custom'
-                      type.
-            unixfd - The file descriptor to the data file.
+                  FFDCFormat- The format type of the contained data.
+                  subType - The format subtype, used for the 'Custom' type.
+                  version - The version of the data format, used for the 'Custom'
+                            type.
+                  unixfd - The file descriptor to the data file.
 
-          e.g.:
-          [
-            {"xyz.openbmc_project.Logging.Create.FFDCFormat.JSON", 0, 0, 5},
-            {"xyz.openbmc_project.Logging.Create.FFDCFormat.Custom", 1, 2, 6}
-          ]
-    returns:
-      - name: IDs
-        type: struct[uint32, uint32]
-        description: >
-          The IDs of the 2 created logs:
-            - OpenBMC event log ID
-            - PEL log ID: The unique ID of the PEL
-          Note that the PEL's platform log ID (PLID) field is always
-          equal to the PEL log ID for BMC created PELs.
+                e.g.:
+                [
+                  {"xyz.openbmc_project.Logging.Create.FFDCFormat.JSON", 0, 0, 5},
+                  {"xyz.openbmc_project.Logging.Create.FFDCFormat.Custom", 1, 2, 6}
+                ]
+      returns:
+          - name: IDs
+            type: struct[uint32, uint32]
+            description: >
+                The IDs of the 2 created logs:
+                  - OpenBMC event log ID
+                  - PEL log ID: The unique ID of the PEL
+                Note that the PEL's platform log ID (PLID) field is always
+                equal to the PEL log ID for BMC created PELs.
 
-  - name: GetPELIdFromBMCLogId
-    description: >
-        Returns the PEL Id (aka Entry ID (EID)) based on the
-        given BMC event log id.
-    parameters:
-      - name: bmcLogId
-        type: uint32
-        description: >
-          The BMC event log id of the PEL to retrieve the PEL id.
-    returns:
-      - name: pelId
-        type: uint32
-        description: >
-            The Id of the PEL.
-    errors:
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: GetPELIdFromBMCLogId
+      description: >
+          Returns the PEL Id (aka Entry ID (EID)) based on the
+          given BMC event log id.
+      parameters:
+          - name: bmcLogId
+            type: uint32
+            description: >
+                The BMC event log id of the PEL to retrieve the PEL id.
+      returns:
+          - name: pelId
+            type: uint32
+            description: >
+                The Id of the PEL.
+      errors:
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
-  - name: GetBMCLogIdFromPELId
-    description: >
-        Returns the BMC event log id based on the given PEL id (aka
-        Entry ID (EID)).
-    parameters:
-      - name: pelId
-        type: uint32
-        description: >
-          The PEL id to retrieve the BMC event log id.
-    returns:
-      - name: bmcLogId
-        type: uint32
-        description: >
-            The BMC event log id of the PEL.
-    errors:
-       - xyz.openbmc_project.Common.Error.InvalidArgument
+    - name: GetBMCLogIdFromPELId
+      description: >
+          Returns the BMC event log id based on the given PEL id (aka
+          Entry ID (EID)).
+      parameters:
+          - name: pelId
+            type: uint32
+            description: >
+                The PEL id to retrieve the BMC event log id.
+      returns:
+          - name: bmcLogId
+            type: uint32
+            description: >
+                The BMC event log id of the PEL.
+      errors:
+          - xyz.openbmc_project.Common.Error.InvalidArgument
 
 enumerations:
-  - name: RejectionReason
-    description: >
-      The reason the PEL was rejected
-    values:
-      - name: BadPEL
-        description: >
-          The PEL was malformed.
-      - name: HostFull
-        description: >
-          The host does not have room for more PELs at this time.
-
+    - name: RejectionReason
+      description: >
+          The reason the PEL was rejected
+      values:
+          - name: BadPEL
+            description: >
+                The PEL was malformed.
+          - name: HostFull
+            description: >
+                The host does not have room for more PELs at this time.
diff --git a/yaml/org/open_power/Logging/PEL/Entry.interface.yaml b/yaml/org/open_power/Logging/PEL/Entry.interface.yaml
index 8a91d10..8576943 100644
--- a/yaml/org/open_power/Logging/PEL/Entry.interface.yaml
+++ b/yaml/org/open_power/Logging/PEL/Entry.interface.yaml
@@ -5,23 +5,23 @@
       type: boolean
       default: false
       description: >
-        Hidden Error - This flag allows events to be placed in a system, but
-        remain hidden from the customer. This event log is visible to
-        development personnel only, e.g. hardware recovered error, etc. No
-        service action is required for this type of errors. In general, when
-        this value is used, the Error Action Flags has the value of
-        "Hidden Error". An event log with this value is used primarily for
-        error thresholding design/code debug or as a record to indicate an
-        error frequency or trend.
+          Hidden Error - This flag allows events to be placed in a system, but
+          remain hidden from the customer. This event log is visible to
+          development personnel only, e.g. hardware recovered error, etc. No
+          service action is required for this type of errors. In general, when
+          this value is used, the Error Action Flags has the value of
+          "Hidden Error". An event log with this value is used primarily for
+          error thresholding design/code debug or as a record to indicate an
+          error frequency or trend.
     - name: Subsystem
       type: string
       description: >
-        A free form, implementation defined string which uniquely and
-        permanently identifies a specific subsystem string. This field should
-        not be used for programmatic interrogation of an object.
+          A free form, implementation defined string which uniquely and
+          permanently identifies a specific subsystem string. This field should
+          not be used for programmatic interrogation of an object.
     - name: ManagementSystemAck
       type: boolean
       default: false
       description: >
-        Notifies the PEL handler that the management system acknowledged a PEL.
-        The management system can be any system monitoring the hardware.
\ No newline at end of file
+          Notifies the PEL handler that the management system acknowledged a PEL.
+          The management system can be any system monitoring the hardware.
diff --git a/yaml/org/open_power/OCC/PassThrough.interface.yaml b/yaml/org/open_power/OCC/PassThrough.interface.yaml
index 99ed8a2..1a4ef66 100644
--- a/yaml/org/open_power/OCC/PassThrough.interface.yaml
+++ b/yaml/org/open_power/OCC/PassThrough.interface.yaml
@@ -5,41 +5,40 @@
       description: >
           Pass through a command to the OCC.
       parameters:
-        - name: command
-          # TODO via https://github.com/openbmc/openbmc/issues/1160. This should
-          # change to array[byte]. As of now, the REST server maps any numeric
-          # data to int32.
-          type: array[int32]
-          description: >
-              An array of integers representing the command and payload. This
-              should still be bytes worth of data (as though using array[byte]),
-              so each entry in the array should pack as many bytes as possible.
+          - name: command
+            # TODO via https://github.com/openbmc/openbmc/issues/1160. This should
+            # change to array[byte]. As of now, the REST server maps any numeric
+            # data to int32.
+            type: array[int32]
+            description: >
+                An array of integers representing the command and payload. This
+                should still be bytes worth of data (as though using array[byte]),
+                so each entry in the array should pack as many bytes as possible.
       returns:
-        - name: response
-          # TODO via https://github.com/openbmc/openbmc/issues/1160. This should
-          # change to array[byte]. As of now, the REST server maps any numeric
-          # data to int32.
-          type: array[int32]
-          description: >
-              An array of integers representing the response. This
-              should still be bytes worth of data (as though using array[byte]),
-              so each entry in the array should pack as many bytes as possible.
+          - name: response
+            # TODO via https://github.com/openbmc/openbmc/issues/1160. This should
+            # change to array[byte]. As of now, the REST server maps any numeric
+            # data to int32.
+            type: array[int32]
+            description: >
+                An array of integers representing the response. This
+                should still be bytes worth of data (as though using array[byte]),
+                so each entry in the array should pack as many bytes as possible.
 
     - name: SetMode
       description: >
           Change the power mode of the system.
       parameters:
-        - name: mode
-          type: byte
-          description: >
-              Desired power mode of the system.
-        - name: frequencyPoint
-          type: uint16
-          description: >
-              Frequency point required by some power modes.
+          - name: mode
+            type: byte
+            description: >
+                Desired power mode of the system.
+          - name: frequencyPoint
+            type: uint16
+            description: >
+                Frequency point required by some power modes.
       returns:
-        - name: status
-          type: boolean
-          description: >
-              Returns true if the mode change was accepted.
-
+          - name: status
+            type: boolean
+            description: >
+                Returns true if the mode change was accepted.
diff --git a/yaml/org/open_power/OCC/Status.interface.yaml b/yaml/org/open_power/OCC/Status.interface.yaml
index ea99fa4..b913c4f 100644
--- a/yaml/org/open_power/OCC/Status.interface.yaml
+++ b/yaml/org/open_power/OCC/Status.interface.yaml
@@ -5,19 +5,19 @@
     - name: OccActive
       type: boolean
       description: >
-        Indicates whether OCC is active or not
+          Indicates whether OCC is active or not
     - name: ThrottleProcTemp
       type: boolean
       default: 0
       description: >
-        Indicates processor throttling due to an over temperature condition
+          Indicates processor throttling due to an over temperature condition
     - name: ThrottleProcPower
       type: boolean
       default: 0
       description: >
-        Indicates processor throttling due to reaching the power cap limit
+          Indicates processor throttling due to reaching the power cap limit
     - name: ThrottleMemTemp
       type: boolean
       default: 0
       description: >
-        Indicates memory throttling due to an over temperature condition
+          Indicates memory throttling due to an over temperature condition
diff --git a/yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml b/yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml
index 93795d9..ae2c326 100644
--- a/yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml
+++ b/yaml/org/open_power/Sensor/Aggregation/History/Average.interface.yaml
@@ -32,26 +32,26 @@
 enumerations:
     - name: Unit
       description: >
-        A sensor reading unit.
+          A sensor reading unit.
       values:
-        - name: DegreesC
-          description: >
-            Temperature as degrees Celsius.
-        - name: RPMS
-          description: >
-            Frequency of rotation as revolutions per minute.
-        - name: Volts
-          description: >
-            Electromotive force as volts.
-        - name: Meters
-          description: >
-            Length as meters.
-        - name: Amperes
-          description: >
-            Electrical charge flow rate as Amperes.
-        - name: Watts
-          description: >
-            Rate of energy transfer as Watts.
-        - name: Joules
-          description: >
-            Energy transfer as Joules.
+          - name: DegreesC
+            description: >
+                Temperature as degrees Celsius.
+          - name: RPMS
+            description: >
+                Frequency of rotation as revolutions per minute.
+          - name: Volts
+            description: >
+                Electromotive force as volts.
+          - name: Meters
+            description: >
+                Length as meters.
+          - name: Amperes
+            description: >
+                Electrical charge flow rate as Amperes.
+          - name: Watts
+            description: >
+                Rate of energy transfer as Watts.
+          - name: Joules
+            description: >
+                Energy transfer as Joules.
diff --git a/yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml b/yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml
index e0f116a..9143ce4 100644
--- a/yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml
+++ b/yaml/org/open_power/Sensor/Aggregation/History/Maximum.interface.yaml
@@ -32,26 +32,26 @@
 enumerations:
     - name: Unit
       description: >
-        A sensor reading unit.
+          A sensor reading unit.
       values:
-        - name: DegreesC
-          description: >
-            Temperature as degrees Celsius.
-        - name: RPMS
-          description: >
-            Frequency of rotation as revolutions per minute.
-        - name: Volts
-          description: >
-            Electromotive force as volts.
-        - name: Meters
-          description: >
-            Length as meters.
-        - name: Amperes
-          description: >
-            Electrical charge flow rate as Amperes.
-        - name: Watts
-          description: >
-            Rate of energy transfer as Watts.
-        - name: Joules
-          description: >
-            Energy transfer as Joules.
+          - name: DegreesC
+            description: >
+                Temperature as degrees Celsius.
+          - name: RPMS
+            description: >
+                Frequency of rotation as revolutions per minute.
+          - name: Volts
+            description: >
+                Electromotive force as volts.
+          - name: Meters
+            description: >
+                Length as meters.
+          - name: Amperes
+            description: >
+                Electrical charge flow rate as Amperes.
+          - name: Watts
+            description: >
+                Rate of energy transfer as Watts.
+          - name: Joules
+            description: >
+                Energy transfer as Joules.