diff --git a/README.md b/README.md
index 0b53ce2..cc06c99 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # phosphor-bmc-code-mgmt
+
 Phosphor BMC Code Management provides a set of system software management
 applications. More information can be found at
 [Software Architecture](https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/README.md)
 
 ## To Build
+
 To build this package, do the following steps:
 
 1. `meson build`
diff --git a/test/README.md b/test/README.md
index 6c3ad4e..154e415 100755
--- a/test/README.md
+++ b/test/README.md
@@ -1,17 +1,16 @@
 Instructions on how to execute UTEST.
 
-* When using an SDK - make sure it has been built
-  for an x86 machine.
+- When using an SDK - make sure it has been built for an x86 machine.
 
-- Run the following commands:
+* Run the following commands:
 
   ```
   meson -Dtests=enabled build
   ninja -C build test
   ```
 
-* WHEN RUNNING UTEST remember to take advantage
-  of the gtest capabilities. "./build/test/utest --help"
+- WHEN RUNNING UTEST remember to take advantage of the gtest capabilities.
+  "./build/test/utest --help"
   - --gtest_repeat=[COUNT]
   - --gtest_shuffle
   - --gtest_random_seed=[NUMBER]
diff --git a/xyz/openbmc_project/Software/Image.errors.yaml b/xyz/openbmc_project/Software/Image.errors.yaml
index 2b8f7ee..c2fda85 100644
--- a/xyz/openbmc_project/Software/Image.errors.yaml
+++ b/xyz/openbmc_project/Software/Image.errors.yaml
@@ -8,4 +8,3 @@
   description: An error occured processing the image.
 - name: BusyFailure
   description: The device is busy during the update.
-
diff --git a/xyz/openbmc_project/Software/Image.metadata.yaml b/xyz/openbmc_project/Software/Image.metadata.yaml
index 7456e0a..a63d4a1 100644
--- a/xyz/openbmc_project/Software/Image.metadata.yaml
+++ b/xyz/openbmc_project/Software/Image.metadata.yaml
@@ -1,28 +1,27 @@
 - name: UnTarFailure
   level: ERR
   meta:
-    - str: "PATH=%s"
-      type: string
+      - str: "PATH=%s"
+        type: string
 - name: ManifestFileFailure
   level: ERR
   meta:
-    - str: "PATH=%s"
-      type: string
+      - str: "PATH=%s"
+        type: string
 - name: InternalFailure
   level: ERR
   meta:
-    - str: "FAIL=%s"
-      type: string
+      - str: "FAIL=%s"
+        type: string
 - name: ImageFailure
   level: ERR
   meta:
-    - str: "FAIL=%s"
-      type: string
-    - str: "PATH=%s"
-      type: string
+      - str: "FAIL=%s"
+        type: string
+      - str: "PATH=%s"
+        type: string
 - name: BusyFailure
   level: ERR
   meta:
-    - str: "PATH=%s"
-      type: string
-
+      - str: "PATH=%s"
+        type: string