diff --git a/libpldmresponder/examples/bios/enum_attrs.json b/libpldmresponder/examples/bios/enum_attrs.json
index e18ffef..bbf04ec 100644
--- a/libpldmresponder/examples/bios/enum_attrs.json
+++ b/libpldmresponder/examples/bios/enum_attrs.json
@@ -1,53 +1,53 @@
 // This is a sample JSON configuration file for BIOS enumeration type
 {
-   "entries":[
-      {
-         "attribute_name" : "HMCManagedState",
-         "possible_values" : [ "On", "Off" ],
-         "default_values" : [ "On" ],
-         // This BIOS attribute has a D-Bus property as backend.
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc_project.HMCManaged.State",
-               "property_name" : "State",
-               "property_type" : "string",
-               // Number of property_values should match to the number of possible values.
-               // Each is entry in the possible_values is mapped to entry in property_values.
-               "property_values" : ["xyz.openbmc_project.State.On", "xyz.openbmc_project.State.Off"]
+    "entries": [
+        {
+            "attribute_name": "HMCManagedState",
+            "possible_values": ["On", "Off"],
+            "default_values": ["On"],
+            // This BIOS attribute has a D-Bus property as backend.
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.HMCManaged.State",
+                "property_name": "State",
+                "property_type": "string",
+                // Number of property_values should match to the number of possible values.
+                // Each is entry in the possible_values is mapped to entry in property_values.
+                "property_values": [
+                    "xyz.openbmc_project.State.On",
+                    "xyz.openbmc_project.State.Off"
+                ]
             }
-      },
-      {
-         "attribute_name" : "FWBootSide",
-         "possible_values" : [ "Perm", "Temp" ],
-         "default_values" : [ "Perm" ],
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc.FWBoot.Side",
-               "property_name" : "Side",
-               "property_type" : "bool",
-               "property_values" : [true, false]
+        },
+        {
+            "attribute_name": "FWBootSide",
+            "possible_values": ["Perm", "Temp"],
+            "default_values": ["Perm"],
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc.FWBoot.Side",
+                "property_name": "Side",
+                "property_type": "bool",
+                "property_values": [true, false]
             }
-      },
-      {
-         "attribute_name" : "InbandCodeUpdate",
-         "possible_values" : [ "Allowed", "NotAllowed" ],
-         "default_values" : [ "Allowed" ],
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc.InBandCodeUpdate",
-               "property_name" : "Policy",
-               "property_type" : "uint8_t",
-               "property_values" : [0, 1]
+        },
+        {
+            "attribute_name": "InbandCodeUpdate",
+            "possible_values": ["Allowed", "NotAllowed"],
+            "default_values": ["Allowed"],
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc.InBandCodeUpdate",
+                "property_name": "Policy",
+                "property_type": "uint8_t",
+                "property_values": [0, 1]
             }
-      },
-      {
-         // This is an example of BIOS Enumeration Read only attribute
-         "attribute_name" : "CodeUpdatePolicy",
-         "possible_values" : [ "Concurrent", "Disruptive" ],
-         "default_values" : [ "Concurrent" ]
-      }
+        },
+        {
+            // This is an example of BIOS Enumeration Read only attribute
+            "attribute_name": "CodeUpdatePolicy",
+            "possible_values": ["Concurrent", "Disruptive"],
+            "default_values": ["Concurrent"]
+        }
     ]
 }
diff --git a/libpldmresponder/examples/bios/integer_attrs.json b/libpldmresponder/examples/bios/integer_attrs.json
index 17f16c1..aecc26d 100644
--- a/libpldmresponder/examples/bios/integer_attrs.json
+++ b/libpldmresponder/examples/bios/integer_attrs.json
@@ -1,35 +1,35 @@
 {
-   "entries":[
-      {
-         "attribute_name" : "VDD_AVSBUS_RAIL",
-         "lower_bound" : 0,
-         "upper_bound" : 15,
-         "scalar_increment" : 1,
-         "default_value" : 0,
-         // This BIOS attribute has a D-Bus property as backend.
-         "dbus":{
-            "object_path" : "/xyz/openbmc_project/avsbus",
-            "interface" : "xyz.openbmc.AvsBus.Manager",
-            "property_type" : "uint8_t",
-            "property_name" : "Rail"
-         }
-      },
-      {
-         // This is an example of BIOS Integer Read only attribute
-         "attribute_name" : "SBE_IMAGE_MINIMUM_VALID_ECS",
-         "lower_bound" : 1,
-         "upper_bound" : 15,
-         "scalar_increment" : 1,
-         "default_value" : 2
-      },
-      {
-         // This atttribute has invalid default value or scalar_increment, when
-         // scalar_increment=2 and lower_bound=1, default_value must be 1, 3, 5...
-         "attribute_name" : "INTEGER_INVALID_CASE",
-         "lower_bound" : 1,
-         "upper_bound" : 15,
-         "scalar_increment" : 2,
-         "default_value" : 4
-      }
-   ]
+    "entries": [
+        {
+            "attribute_name": "VDD_AVSBUS_RAIL",
+            "lower_bound": 0,
+            "upper_bound": 15,
+            "scalar_increment": 1,
+            "default_value": 0,
+            // This BIOS attribute has a D-Bus property as backend.
+            "dbus": {
+                "object_path": "/xyz/openbmc_project/avsbus",
+                "interface": "xyz.openbmc.AvsBus.Manager",
+                "property_type": "uint8_t",
+                "property_name": "Rail"
+            }
+        },
+        {
+            // This is an example of BIOS Integer Read only attribute
+            "attribute_name": "SBE_IMAGE_MINIMUM_VALID_ECS",
+            "lower_bound": 1,
+            "upper_bound": 15,
+            "scalar_increment": 1,
+            "default_value": 2
+        },
+        {
+            // This atttribute has invalid default value or scalar_increment, when
+            // scalar_increment=2 and lower_bound=1, default_value must be 1, 3, 5...
+            "attribute_name": "INTEGER_INVALID_CASE",
+            "lower_bound": 1,
+            "upper_bound": 15,
+            "scalar_increment": 2,
+            "default_value": 4
+        }
+    ]
 }
diff --git a/libpldmresponder/examples/bios/string_attrs.json b/libpldmresponder/examples/bios/string_attrs.json
index 2e2eaf1..81b806e 100644
--- a/libpldmresponder/examples/bios/string_attrs.json
+++ b/libpldmresponder/examples/bios/string_attrs.json
@@ -1,47 +1,45 @@
 // This is a sample JSON configuration file for BIOS string type
 {
-   "entries":[
-      {
-         "attribute_name" : "str_example1",
-         // Possible values of string type {Unknown=0x00, ASCII=0x01, Hex=0x02,
-         // UTF-8=0x03, UTF-16LE=0x04, UTF-16BE=0x05, Vendor Specific=0xFF}
-         "string_type" : "ASCII",
-         "minimum_string_length" : 1,
-         "maximum_string_length" : 100,
-         "default_string_length" : 3,
-         "default_string" : "abc",
-         // This BIOS attribute has a D-Bus property as backend.
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc_project.str_example1.value",
-               "property_name" : "Str_example1",
-               "property_type" : "string"
+    "entries": [
+        {
+            "attribute_name": "str_example1",
+            // Possible values of string type {Unknown=0x00, ASCII=0x01, Hex=0x02,
+            // UTF-8=0x03, UTF-16LE=0x04, UTF-16BE=0x05, Vendor Specific=0xFF}
+            "string_type": "ASCII",
+            "minimum_string_length": 1,
+            "maximum_string_length": 100,
+            "default_string_length": 3,
+            "default_string": "abc",
+            // This BIOS attribute has a D-Bus property as backend.
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.str_example1.value",
+                "property_name": "Str_example1",
+                "property_type": "string"
             }
-      },
-      {
-         "attribute_name" : "str_example2",
-         "string_type" : "Hex",
-         "minimum_string_length" : 0,
-         "maximum_string_length" : 100,
-         "default_string_length" : 0,
-         "default_string" : "",
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc_project.str_example2.value",
-               "property_name" : "Str_example2",
-               "property_type" : "string"
+        },
+        {
+            "attribute_name": "str_example2",
+            "string_type": "Hex",
+            "minimum_string_length": 0,
+            "maximum_string_length": 100,
+            "default_string_length": 0,
+            "default_string": "",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.str_example2.value",
+                "property_name": "Str_example2",
+                "property_type": "string"
             }
-      },
-      {
-         // This is an example of BIOS String Read only attribute
-         "attribute_name" : "str_example3",
-         "string_type" : "Unknown",
-         "minimum_string_length" : 1,
-         "maximum_string_length" : 100,
-         "default_string_length" : 2,
-         "default_string" : "ef"
-      }
+        },
+        {
+            // This is an example of BIOS String Read only attribute
+            "attribute_name": "str_example3",
+            "string_type": "Unknown",
+            "minimum_string_length": 1,
+            "maximum_string_length": 100,
+            "default_string_length": 2,
+            "default_string": "ef"
+        }
     ]
 }
diff --git a/libpldmresponder/examples/effecter/dbus_to_host_effecter.json b/libpldmresponder/examples/effecter/dbus_to_host_effecter.json
index 4646693..ecff34d 100644
--- a/libpldmresponder/examples/effecter/dbus_to_host_effecter.json
+++ b/libpldmresponder/examples/effecter/dbus_to_host_effecter.json
@@ -17,11 +17,11 @@
             },
             "effecters": [
                 {
-                // Following are the D-Bus information under each effecter
-                // which are monitored for a property change signal
+                    // Following are the D-Bus information under each effecter
+                    // which are monitored for a property change signal
 
-                // if there is a property change, the corresponding
-                // state value is picked up to set the host effecter
+                    // if there is a property change, the corresponding
+                    // state value is picked up to set the host effecter
 
                     "dbus_info": {
                         "object_path": "/xyz/abc/def",
@@ -33,14 +33,11 @@
                             "xyz.openbmc_project.State.Off"
                         ]
                     },
-                    "state" : {
-                        "id" : 197,
+                    "state": {
+                        "id": 197,
                         // This should be of same size and order as
                         // property_values
-                        "state_values": [
-                            0,
-                            1
-                        ]
+                        "state_values": [0, 1]
                     }
                 },
                 {
@@ -49,17 +46,11 @@
                         "interface": "xyz.openbmc_project.example1.value",
                         "property_name": "value2",
                         "property_type": "uint8_t",
-                        "property_values": [
-                            9,
-                            10
-                        ]
+                        "property_values": [9, 10]
                     },
-                    "state" : {
-                        "id" : 12,
-                        "state_values": [
-                            2,
-                            3
-                        ]
+                    "state": {
+                        "id": 12,
+                        "state_values": [2, 3]
                     }
                 },
                 {
@@ -68,17 +59,11 @@
                         "interface": "xyz.openbmc_project.example3.value",
                         "property_name": "value3",
                         "property_type": "bool",
-                        "property_values": [
-                            false,
-                            true
-                        ]
+                        "property_values": [false, true]
                     },
-                    "state" : {
-                        "id" : 12,
-                        "state_values": [
-                            0,
-                            1
-                        ]
+                    "state": {
+                        "id": 12,
+                        "state_values": [0, 1]
                     }
                 }
             ]
@@ -104,12 +89,9 @@
                             "xyz.openbmc_project.State.Disabled"
                         ]
                     },
-                    "state" : {
-                        "id" : 15,
-                        "state_values": [
-                            3,
-                            4
-                        ]
+                    "state": {
+                        "id": 15,
+                        "state_values": [3, 4]
                     }
                 }
             ]
diff --git a/libpldmresponder/examples/events/event_state_sensor.json b/libpldmresponder/examples/events/event_state_sensor.json
index 17ce751..d59366f 100644
--- a/libpldmresponder/examples/events/event_state_sensor.json
+++ b/libpldmresponder/examples/events/event_state_sensor.json
@@ -10,10 +10,7 @@
             "entityType": 64,
             "entityInstance": 1,
             "sensorOffset": 0,
-            "event_states": [
-                0,
-                1
-            ],
+            "event_states": [0, 1],
             "dbus": {
                 "object_path": "/xyz/abc/def",
                 "interface": "xyz.openbmc_project.example1.value",
@@ -30,19 +27,13 @@
             "entityType": 64,
             "entityInstance": 1,
             "sensorOffset": 1,
-            "event_states": [
-                2,
-                3
-            ],
+            "event_states": [2, 3],
             "dbus": {
                 "object_path": "/xyz/abc/def",
                 "interface": "xyz.openbmc_project.example2.value",
                 "property_name": "value2",
                 "property_type": "uint8_t",
-                "property_values": [
-                    9,
-                    10
-                ]
+                "property_values": [9, 10]
             }
         },
         {
@@ -50,19 +41,13 @@
             "entityType": 67,
             "entityInstance": 1,
             "sensorOffset": 0,
-            "event_states": [
-                0,
-                1
-            ],
+            "event_states": [0, 1],
             "dbus": {
                 "object_path": "/xyz/abc/ghi",
                 "interface": "xyz.openbmc_project.example3.value",
                 "property_name": "value3",
                 "property_type": "bool",
-                "property_values": [
-                    false,
-                    true
-                ]
+                "property_values": [false, true]
             }
         }
     ]
diff --git a/libpldmresponder/examples/fru/Board_General.json b/libpldmresponder/examples/fru/Board_General.json
index c9914b6..b8132e2 100644
--- a/libpldmresponder/examples/fru/Board_General.json
+++ b/libpldmresponder/examples/fru/Board_General.json
@@ -1,37 +1,33 @@
 // This JSON has the information needed to create General FRU record for FRU of
 // type Board. The FRU fields are based on the PLDM specification DSP0257.
 {
-   "record_details":
-   {
+    "record_details": {
         // FRU Record Type - General FRU Record
-        "fru_record_type" : 1,
+        "fru_record_type": 1,
         // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
-   },
-   "fru_fields":[
-      {
-         // FRU Field Type 3 - Part Number
-         "fru_field_type" : 3,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "PartNumber",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            // FRU Field Type 3 - Part Number
+            "fru_field_type": 3,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "PartNumber",
+                "property_type": "string"
             }
-      },
-      {
-         // FRU Field Type 4 - Serial Number
-         "fru_field_type" : 4,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "SerialNumber",
-               "property_type" : "string"
+        },
+        {
+            // FRU Field Type 4 - Serial Number
+            "fru_field_type": 4,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "SerialNumber",
+                "property_type": "string"
             }
-      }
+        }
     ]
 }
-
diff --git a/libpldmresponder/examples/fru/Board_VINI.json b/libpldmresponder/examples/fru/Board_VINI.json
index fbb710a..45936d1 100644
--- a/libpldmresponder/examples/fru/Board_VINI.json
+++ b/libpldmresponder/examples/fru/Board_VINI.json
@@ -1,38 +1,33 @@
 // This JSON has the information needed to create OEM FRU record VINI for FRU of
 // type Board.
 {
-   "record_details":
-   {
+    "record_details": {
         // FRU Record Type - OEM FRU Record
-        "fru_record_type" : 254,
+        "fru_record_type": 254,
         // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
-   },
-   "fru_fields":[
-      {
-         // FRU Field Type 2 - Keyword RT
-         "fru_field_type" : 2,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "com.ibm.ipzvpd.VINI",
-               "property_name" : "RT",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            // FRU Field Type 2 - Keyword RT
+            "fru_field_type": 2,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "com.ibm.ipzvpd.VINI",
+                "property_name": "RT",
+                "property_type": "string"
             }
-      },
-      {
-         // FRU Field Type 3 - Keyword B3
-         "fru_field_type" : 3,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "com.ibm.ipzvpd.VINI",
-               "property_name" : "B3",
-               "property_type" : "bytearray"
+        },
+        {
+            // FRU Field Type 3 - Keyword B3
+            "fru_field_type": 3,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "com.ibm.ipzvpd.VINI",
+                "property_name": "B3",
+                "property_type": "bytearray"
             }
-      }
-
+        }
     ]
 }
-
diff --git a/libpldmresponder/examples/fru/Cpu_General.json b/libpldmresponder/examples/fru/Cpu_General.json
index 3595d79..e0b02d9 100644
--- a/libpldmresponder/examples/fru/Cpu_General.json
+++ b/libpldmresponder/examples/fru/Cpu_General.json
@@ -1,36 +1,33 @@
 // This JSON has the information needed to create General FRU record for FRU of
 // type Cpu. The FRU fields are based on the PLDM specification DSP0257.
 {
-   "record_details":
-   {
+    "record_details": {
         // FRU Record Type - General FRU Record
-        "fru_record_type" : 1,
+        "fru_record_type": 1,
         // Encoding Type for FRU fields - ASCII
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Cpu"
-   },
-   "fru_fields":[
-      {
-         // FRU Field Type 3 - Part Number
-         "fru_field_type" : 3,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "PartNumber",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            // FRU Field Type 3 - Part Number
+            "fru_field_type": 3,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "PartNumber",
+                "property_type": "string"
             }
-      },
-      {
-         // FRU Field Type 4 - Serial Number
-         "fru_field_type" : 4,
-         // D-Bus property to read and populate the FRU field
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "SerialNumber",
-               "property_type" : "string"
+        },
+        {
+            // FRU Field Type 4 - Serial Number
+            "fru_field_type": 4,
+            // D-Bus property to read and populate the FRU field
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "SerialNumber",
+                "property_type": "string"
             }
-      }
+        }
     ]
 }
diff --git a/libpldmresponder/examples/fru/FRU_Master.json b/libpldmresponder/examples/fru/FRU_Master.json
index 710c5e1..54aa619 100644
--- a/libpldmresponder/examples/fru/FRU_Master.json
+++ b/libpldmresponder/examples/fru/FRU_Master.json
@@ -12,16 +12,16 @@
 // the OEM record (VINI is a record in IBM IPZ VPD format) for FRU of type Board.
 // For all instances of the same FRU, the same config JSON will apply.
 {
-    "service":"xyz.openbmc_project.Inventory.Manager",
-    "root_path":"/xyz/openbmc_project/inventory",
-    "entities":[
+    "service": "xyz.openbmc_project.Inventory.Manager",
+    "root_path": "/xyz/openbmc_project/inventory",
+    "entities": [
         {
-            "interface" : "xyz.openbmc_project.Inventory.Item.Board",
-            "entity_type" : 64
+            "interface": "xyz.openbmc_project.Inventory.Item.Board",
+            "entity_type": 64
         },
         {
-            "interface" : "xyz.openbmc_project.Inventory.Item.Cpu",
-            "entity_type" : 135
+            "interface": "xyz.openbmc_project.Inventory.Item.Cpu",
+            "entity_type": 135
         }
     ]
 }
diff --git a/libpldmresponder/examples/fru/host_frus.json b/libpldmresponder/examples/fru/host_frus.json
index d0348c1..ad8b62b 100644
--- a/libpldmresponder/examples/fru/host_frus.json
+++ b/libpldmresponder/examples/fru/host_frus.json
@@ -1,22 +1,20 @@
 {
-        "entities":[
-            {
-                // Entity Type 64 from the host has ...
-                "entity_type" : 64,
-                "parent":
-                     {
-                        // ... entity type 100 and instance 1 on the BMC as parent
-                        "entity_type" : 100,
-                        "entity_instance" : 1
-                     }
-            },
-            {
-                "entity_type" : 65,
-                "parent":
-                     {
-                        "entity_type" : 100,
-                        "entity_instance" : 1
-                     }
+    "entities": [
+        {
+            // Entity Type 64 from the host has ...
+            "entity_type": 64,
+            "parent": {
+                // ... entity type 100 and instance 1 on the BMC as parent
+                "entity_type": 100,
+                "entity_instance": 1
             }
-        ]
+        },
+        {
+            "entity_type": 65,
+            "parent": {
+                "entity_type": 100,
+                "entity_instance": 1
+            }
+        }
+    ]
 }
diff --git a/libpldmresponder/examples/pdr/effecter_pdr.json b/libpldmresponder/examples/pdr/effecter_pdr.json
index ccdc7ac..3b7fa06 100644
--- a/libpldmresponder/examples/pdr/effecter_pdr.json
+++ b/libpldmresponder/examples/pdr/effecter_pdr.json
@@ -1,127 +1,115 @@
 {
-  "effecterPDRs": [
-    {
-      "pdrType": 11,
-      "entries": [
+    "effecterPDRs": [
         {
-          "entity_path": "/xyz/openbmc_project/foo",
-          "type": 33,
-          "instance": 0,
-          "container": 0,
-          "effecters": [
-            {
-              "set": {
-                "id": 196,
-                "size": 1,
-                "states": [
-                  1
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V1"
-                ]
-              }
-            },
-            {
-              "set": {
-                "id": 196,
-                "size": 1,
-                "states": [
-                  1,
-                  2
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V1",
-                  "xyz.openbmc_project.Foo.Bar.V2"
-                ]
-              }
-            }
-          ]
+            "pdrType": 11,
+            "entries": [
+                {
+                    "entity_path": "/xyz/openbmc_project/foo",
+                    "type": 33,
+                    "instance": 0,
+                    "container": 0,
+                    "effecters": [
+                        {
+                            "set": {
+                                "id": 196,
+                                "size": 1,
+                                "states": [1]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V1"
+                                ]
+                            }
+                        },
+                        {
+                            "set": {
+                                "id": 196,
+                                "size": 1,
+                                "states": [1, 2]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V1",
+                                    "xyz.openbmc_project.Foo.Bar.V2"
+                                ]
+                            }
+                        }
+                    ]
+                },
+                {
+                    "entity_path": "/xyz/openbmc_project/foo",
+                    "type": 100,
+                    "instance": 0,
+                    "container": 0,
+                    "effecters": [
+                        {
+                            "set": {
+                                "id": 197,
+                                "size": 1,
+                                "states": [1]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V1"
+                                ]
+                            }
+                        },
+                        {
+                            "set": {
+                                "id": 198,
+                                "size": 2,
+                                "states": [1, 2, 5, 15]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar/baz",
+                                "interface": "xyz.openbmc_project.Foo.Bar.Baz",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.Baz.V1",
+                                    "xyz.openbmc_project.Foo.Bar.Baz.V2",
+                                    "xyz.openbmc_project.Foo.Bar.Baz.V5",
+                                    "xyz.openbmc_project.Foo.Bar.Baz.V15"
+                                ]
+                            }
+                        }
+                    ]
+                }
+            ]
         },
         {
-          "entity_path": "/xyz/openbmc_project/foo",
-          "type": 100,
-          "instance": 0,
-          "container": 0,
-          "effecters": [
-            {
-              "set": {
-                "id": 197,
-                "size": 1,
-                "states": [
-                  1
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V1"
-                ]
-              }
-            },
-            {
-              "set": {
-                "id": 198,
-                "size": 2,
-                "states": [
-                  1,
-                  2,
-                  5,
-                  15
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar/baz",
-                "interface": "xyz.openbmc_project.Foo.Bar.Baz",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.Baz.V1",
-                  "xyz.openbmc_project.Foo.Bar.Baz.V2",
-                  "xyz.openbmc_project.Foo.Bar.Baz.V5",
-                  "xyz.openbmc_project.Foo.Bar.Baz.V15"
-                ]
-              }
-            }
-          ]
+            "pdrType": 9,
+            "entries": [
+                {
+                    "entity_path": "/xyz/openbmc_project/foo",
+                    "type": 0,
+                    "instance": 0,
+                    "container": 0,
+                    "base_unit": 21,
+                    "rate_unit": 3,
+                    "effecter_resolution_init": 1,
+                    "effecter_data_size": 4,
+                    "range_field_format": 4,
+                    "dbus": {
+                        "path": "/foo/bar",
+                        "interface": "xyz.openbmc_project.Foo.Bar",
+                        "property_name": "propertyName",
+                        "property_type": "uint64_t"
+                    }
+                }
+            ]
         }
-      ]
-    },
-    {
-      "pdrType": 9,
-      "entries": [
-        {
-          "entity_path": "/xyz/openbmc_project/foo",
-          "type": 0,
-          "instance": 0,
-          "container": 0,
-          "base_unit": 21,
-          "rate_unit": 3,
-          "effecter_resolution_init": 1,
-          "effecter_data_size": 4,
-          "range_field_format": 4,
-          "dbus": {
-            "path": "/foo/bar",
-            "interface": "xyz.openbmc_project.Foo.Bar",
-            "property_name": "propertyName",
-            "property_type": "uint64_t"
-          }
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    ]
+}
diff --git a/libpldmresponder/examples/pdr/sensor_pdr.json b/libpldmresponder/examples/pdr/sensor_pdr.json
index 1d0489a..8f0ee34 100644
--- a/libpldmresponder/examples/pdr/sensor_pdr.json
+++ b/libpldmresponder/examples/pdr/sensor_pdr.json
@@ -1,64 +1,58 @@
 // This JSON is tied with BMC's PDRs. Each entry is used to identify a group of
 // composite sensors.
 {
-  "sensorPDRs": [
-    {
-      // StateSensorPDR
-      // Each sensor in each group of composite sensors has a separate entry and the
-      // supported event states, up to eight.
-      // The "dbus" section contains information about the corresponding D-Bus
-      // property for the sensor and "property_values" are the D-Bus property values
-      // for each corresponding entry in the "states".
-      "pdrType": 4,
-      "entries": [
+    "sensorPDRs": [
         {
-          "type": 5,
-          "instance": 0,
-          "container": 0,
-          "sensors": [
-            {
-              "set": {
-                "id": 1,
-                "size": 1,
-                "states": [
-                  0,
-                  5
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V0",
-                  "xyz.openbmc_project.Foo.Bar.V5"
-                ]
-              }
-            },
-            {
-              "set": {
-                "id": 2,
-                "size": 1,
-                "states": [
-                  2,
-                  3
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V2",
-                  "xyz.openbmc_project.Foo.Bar.V3"
-                ]
-              }
-            }
-          ]
+            // StateSensorPDR
+            // Each sensor in each group of composite sensors has a separate entry and the
+            // supported event states, up to eight.
+            // The "dbus" section contains information about the corresponding D-Bus
+            // property for the sensor and "property_values" are the D-Bus property values
+            // for each corresponding entry in the "states".
+            "pdrType": 4,
+            "entries": [
+                {
+                    "type": 5,
+                    "instance": 0,
+                    "container": 0,
+                    "sensors": [
+                        {
+                            "set": {
+                                "id": 1,
+                                "size": 1,
+                                "states": [0, 5]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V0",
+                                    "xyz.openbmc_project.Foo.Bar.V5"
+                                ]
+                            }
+                        },
+                        {
+                            "set": {
+                                "id": 2,
+                                "size": 1,
+                                "states": [2, 3]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V2",
+                                    "xyz.openbmc_project.Foo.Bar.V3"
+                                ]
+                            }
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/libpldmresponder/test/bios_jsons/enum_attrs.json b/libpldmresponder/test/bios_jsons/enum_attrs.json
index bee666f..ef4f684 100644
--- a/libpldmresponder/test/bios_jsons/enum_attrs.json
+++ b/libpldmresponder/test/bios_jsons/enum_attrs.json
@@ -1,60 +1,60 @@
 {
-   "entries":[
-      {
-         "attribute_name" : "HMCManagedState",
-         "possible_values" : [ "On", "Off" ],
-         "default_values" : [ "On" ],
-         "readOnly" : false,
-         "helpText" : "HMCManagedState HelpText",
-         "displayName" : "HMCManagedState DisplayName",
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc_project.HMCManaged.State",
-               "property_name" : "State",
-               "property_type" : "string",
-               "property_values" : ["xyz.openbmc_project.State.On", "xyz.openbmc_project.State.Off"]
+    "entries": [
+        {
+            "attribute_name": "HMCManagedState",
+            "possible_values": ["On", "Off"],
+            "default_values": ["On"],
+            "readOnly": false,
+            "helpText": "HMCManagedState HelpText",
+            "displayName": "HMCManagedState DisplayName",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.HMCManaged.State",
+                "property_name": "State",
+                "property_type": "string",
+                "property_values": [
+                    "xyz.openbmc_project.State.On",
+                    "xyz.openbmc_project.State.Off"
+                ]
             }
-      },
-      {
-         "attribute_name" : "FWBootSide",
-         "possible_values" : [ "Perm", "Temp" ],
-         "default_values" : [ "Perm" ],
-         "readOnly" : false,
-         "helpText" : "FWBootSide HelpText",
-         "displayName" : "FWBootSide DisplayName",
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc.FWBoot.Side",
-               "property_name" : "Side",
-               "property_type" : "bool",
-               "property_values" : [true, false]
+        },
+        {
+            "attribute_name": "FWBootSide",
+            "possible_values": ["Perm", "Temp"],
+            "default_values": ["Perm"],
+            "readOnly": false,
+            "helpText": "FWBootSide HelpText",
+            "displayName": "FWBootSide DisplayName",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc.FWBoot.Side",
+                "property_name": "Side",
+                "property_type": "bool",
+                "property_values": [true, false]
             }
-      },
-      {
-         "attribute_name" : "InbandCodeUpdate",
-         "possible_values" : [ "Allowed", "NotAllowed" ],
-         "default_values" : [ "Allowed" ],
-         "readOnly" : false,
-         "helpText" : "InbandCodeUpdate HelpText",
-         "displayName" : "InbandCodeUpdate DisplayName",
-         "dbus":
-            {
-               "object_path" : "/xyz/abc/def",
-               "interface" : "xyz.openbmc.InBandCodeUpdate",
-               "property_name" : "Policy",
-               "property_type" : "uint8_t",
-               "property_values" : [0, 1]
+        },
+        {
+            "attribute_name": "InbandCodeUpdate",
+            "possible_values": ["Allowed", "NotAllowed"],
+            "default_values": ["Allowed"],
+            "readOnly": false,
+            "helpText": "InbandCodeUpdate HelpText",
+            "displayName": "InbandCodeUpdate DisplayName",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc.InBandCodeUpdate",
+                "property_name": "Policy",
+                "property_type": "uint8_t",
+                "property_values": [0, 1]
             }
-      },
-      {
-         "attribute_name" : "CodeUpdatePolicy",
-         "possible_values" : [ "Concurrent", "Disruptive" ],
-         "default_values" : [ "Concurrent" ],
-         "readOnly" : true,
-         "helpText" : "CodeUpdatePolicy HelpText",
-         "displayName" : "CodeUpdatePolicy DisplayName"
-      }
+        },
+        {
+            "attribute_name": "CodeUpdatePolicy",
+            "possible_values": ["Concurrent", "Disruptive"],
+            "default_values": ["Concurrent"],
+            "readOnly": true,
+            "helpText": "CodeUpdatePolicy HelpText",
+            "displayName": "CodeUpdatePolicy DisplayName"
+        }
     ]
 }
diff --git a/libpldmresponder/test/bios_jsons/integer_attrs.json b/libpldmresponder/test/bios_jsons/integer_attrs.json
index e6833aa..4d7cd61 100644
--- a/libpldmresponder/test/bios_jsons/integer_attrs.json
+++ b/libpldmresponder/test/bios_jsons/integer_attrs.json
@@ -1,40 +1,40 @@
 {
-   "entries":[
-      {
-         "attribute_name" : "VDD_AVSBUS_RAIL",
-         "lower_bound" : 0,
-         "upper_bound" : 15,
-         "scalar_increment" : 1,
-         "default_value" : 0,
-         "readOnly" : false,
-         "helpText" : "VDD_AVSBUS_RAIL HelpText",
-         "displayName" : "VDD_AVSBUS_RAIL DisplayName",
-         "dbus":{
-            "object_path" : "/xyz/openbmc_project/avsbus",
-            "interface" : "xyz.openbmc.AvsBus.Manager",
-            "property_type" : "uint8_t",
-            "property_name" : "Rail"
-         }
-      },
-      {
-         "attribute_name" : "SBE_IMAGE_MINIMUM_VALID_ECS",
-         "lower_bound" : 1,
-         "upper_bound" : 15,
-         "scalar_increment" : 1,
-         "default_value" : 2,
-         "readOnly" : true,
-         "helpText" : "SBE_IMAGE_MINIMUM_VALID_ECS HelpText",
-         "displayName" : "SBE_IMAGE_MINIMUM_VALID_ECS DisplayName"
-      },
-      {
-         "attribute_name" : "INTEGER_INVALID_CASE",
-         "lower_bound" : 1,
-         "upper_bound" : 15,
-         "scalar_increment" : 2,
-         "default_value" : 3,
-         "readOnly" : true,
-         "helpText" : "INTEGER_INVALID_CASE HelpText",
-         "displayName" : "INTEGER_INVALID_CASE DisplayName"
-      }
-   ]
+    "entries": [
+        {
+            "attribute_name": "VDD_AVSBUS_RAIL",
+            "lower_bound": 0,
+            "upper_bound": 15,
+            "scalar_increment": 1,
+            "default_value": 0,
+            "readOnly": false,
+            "helpText": "VDD_AVSBUS_RAIL HelpText",
+            "displayName": "VDD_AVSBUS_RAIL DisplayName",
+            "dbus": {
+                "object_path": "/xyz/openbmc_project/avsbus",
+                "interface": "xyz.openbmc.AvsBus.Manager",
+                "property_type": "uint8_t",
+                "property_name": "Rail"
+            }
+        },
+        {
+            "attribute_name": "SBE_IMAGE_MINIMUM_VALID_ECS",
+            "lower_bound": 1,
+            "upper_bound": 15,
+            "scalar_increment": 1,
+            "default_value": 2,
+            "readOnly": true,
+            "helpText": "SBE_IMAGE_MINIMUM_VALID_ECS HelpText",
+            "displayName": "SBE_IMAGE_MINIMUM_VALID_ECS DisplayName"
+        },
+        {
+            "attribute_name": "INTEGER_INVALID_CASE",
+            "lower_bound": 1,
+            "upper_bound": 15,
+            "scalar_increment": 2,
+            "default_value": 3,
+            "readOnly": true,
+            "helpText": "INTEGER_INVALID_CASE HelpText",
+            "displayName": "INTEGER_INVALID_CASE DisplayName"
+        }
+    ]
 }
diff --git a/libpldmresponder/test/bios_jsons/string_attrs.json b/libpldmresponder/test/bios_jsons/string_attrs.json
index 09e0e4c..5213aaf 100644
--- a/libpldmresponder/test/bios_jsons/string_attrs.json
+++ b/libpldmresponder/test/bios_jsons/string_attrs.json
@@ -1,49 +1,49 @@
 {
-    "entries" : [
+    "entries": [
         {
-            "attribute_name" : "str_example1",
-            "string_type" : "ASCII",
-            "minimum_string_length" : 1,
-            "maximum_string_length" : 100,
-            "default_string_length" : 3,
-            "default_string" : "abc",
-            "readOnly" : false,
-            "helpText" : "str_example1 HelpText",
-            "displayName" : "str_example1 DisplayName",
-            "dbus" : {
-                "object_path" : "/xyz/abc/def",
-                "interface" : "xyz.openbmc_project.str_example1.value",
-                "property_name" : "Str_example1",
-                "property_type" : "string"
+            "attribute_name": "str_example1",
+            "string_type": "ASCII",
+            "minimum_string_length": 1,
+            "maximum_string_length": 100,
+            "default_string_length": 3,
+            "default_string": "abc",
+            "readOnly": false,
+            "helpText": "str_example1 HelpText",
+            "displayName": "str_example1 DisplayName",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.str_example1.value",
+                "property_name": "Str_example1",
+                "property_type": "string"
             }
         },
         {
-            "attribute_name" : "str_example2",
-            "string_type" : "Hex",
-            "minimum_string_length" : 0,
-            "maximum_string_length" : 100,
-            "default_string_length" : 0,
-            "default_string" : "",
-            "readOnly" : false,
-            "helpText" : "str_example2 HelpText",
-            "displayName" : "str_example2 DisplayName",
-            "dbus" : {
-                "object_path" : "/xyz/abc/def",
-                "interface" : "xyz.openbmc_project.str_example2.value",
-                "property_name" : "Str_example2",
-                "property_type" : "string"
+            "attribute_name": "str_example2",
+            "string_type": "Hex",
+            "minimum_string_length": 0,
+            "maximum_string_length": 100,
+            "default_string_length": 0,
+            "default_string": "",
+            "readOnly": false,
+            "helpText": "str_example2 HelpText",
+            "displayName": "str_example2 DisplayName",
+            "dbus": {
+                "object_path": "/xyz/abc/def",
+                "interface": "xyz.openbmc_project.str_example2.value",
+                "property_name": "Str_example2",
+                "property_type": "string"
             }
         },
         {
-            "attribute_name" : "str_example3",
-            "string_type" : "Unknown",
-            "minimum_string_length" : 1,
-            "maximum_string_length" : 100,
-            "default_string_length" : 2,
-            "default_string" : "ef",
-            "readOnly" : true,
-            "helpText" : "str_example3 HelpText",
-            "displayName" : "str_example3 DisplayName"
+            "attribute_name": "str_example3",
+            "string_type": "Unknown",
+            "minimum_string_length": 1,
+            "maximum_string_length": 100,
+            "default_string_length": 2,
+            "default_string": "ef",
+            "readOnly": true,
+            "helpText": "str_example3 HelpText",
+            "displayName": "str_example3 DisplayName"
         }
     ]
 }
diff --git a/libpldmresponder/test/event_jsons/good/event_state_sensor.json b/libpldmresponder/test/event_jsons/good/event_state_sensor.json
index 9dc613c..f917b90 100644
--- a/libpldmresponder/test/event_jsons/good/event_state_sensor.json
+++ b/libpldmresponder/test/event_jsons/good/event_state_sensor.json
@@ -5,11 +5,7 @@
             "entityType": 64,
             "entityInstance": 1,
             "sensorOffset": 0,
-            "event_states": [
-                0,
-                1,
-                2
-            ],
+            "event_states": [0, 1, 2],
             "dbus": {
                 "object_path": "/xyz/abc/def",
                 "interface": "xyz.openbmc_project.example1.value",
@@ -27,19 +23,13 @@
             "entityType": 64,
             "entityInstance": 1,
             "sensorOffset": 1,
-            "event_states": [
-                2,
-                3
-            ],
+            "event_states": [2, 3],
             "dbus": {
                 "object_path": "/xyz/abc/def",
                 "interface": "xyz.openbmc_project.example2.value",
                 "property_name": "value2",
                 "property_type": "uint8_t",
-                "property_values": [
-                    9,
-                    10
-                ]
+                "property_values": [9, 10]
             }
         },
         {
@@ -47,19 +37,13 @@
             "entityType": 67,
             "entityInstance": 2,
             "sensorOffset": 0,
-            "event_states": [
-                0,
-                1
-            ],
+            "event_states": [0, 1],
             "dbus": {
                 "object_path": "/xyz/abc/ghi",
                 "interface": "xyz.openbmc_project.example3.value",
                 "property_name": "value3",
                 "property_type": "bool",
-                "property_values": [
-                    false,
-                    true
-                ]
+                "property_values": [false, true]
             }
         }
     ]
diff --git a/libpldmresponder/test/fru_jsons/fru_master/fru_master.json b/libpldmresponder/test/fru_jsons/fru_master/fru_master.json
index 5a87eb7..ab3f13a 100644
--- a/libpldmresponder/test/fru_jsons/fru_master/fru_master.json
+++ b/libpldmresponder/test/fru_jsons/fru_master/fru_master.json
@@ -1,21 +1,21 @@
 {
-        "FruDBusLookupMap":{
-                        "xyz.openbmc_project.Inventory.Item.Chassis" : 45,
-                        "xyz.openbmc_project.Inventory.Item.Board": 60,
-                        "xyz.openbmc_project.Inventory.Item.PCIeDevice": 61,
-                        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": 64,
-                        "xyz.openbmc_project.Inventory.Item.Dimm": 66,
-                        "xyz.openbmc_project.Inventory.Item.Panel": 69,
-                        "xyz.openbmc_project.Inventory.Item.DiskBackplane": 73,
-                        "xyz.openbmc_project.Inventory.Item.Fan": 93,
-                        "xyz.openbmc_project.Inventory.Item.PowerSupply": 120,
-                        "xyz.openbmc_project.Inventory.Item.Battery": 121,
-                        "xyz.openbmc_project.Inventory.Item.Vrm": 123,
-                        "xyz.openbmc_project.Inventory.Item.Cpu": 135,
-                        "xyz.openbmc_project.Inventory.Item.Bmc": 137,
-                        "xyz.openbmc_project.Inventory.Item.Connector": 185,
-                        "xyz.openbmc_project.Inventory.Item.PCIeSlot": 186,
-                        "xyz.openbmc_project.Inventory.Item.System": 11521,
-                        "xyz.openbmc_project.Inventory.Item.Tpm": 24576
-           }
+    "FruDBusLookupMap": {
+        "xyz.openbmc_project.Inventory.Item.Chassis": 45,
+        "xyz.openbmc_project.Inventory.Item.Board": 60,
+        "xyz.openbmc_project.Inventory.Item.PCIeDevice": 61,
+        "xyz.openbmc_project.Inventory.Item.Board.Motherboard": 64,
+        "xyz.openbmc_project.Inventory.Item.Dimm": 66,
+        "xyz.openbmc_project.Inventory.Item.Panel": 69,
+        "xyz.openbmc_project.Inventory.Item.DiskBackplane": 73,
+        "xyz.openbmc_project.Inventory.Item.Fan": 93,
+        "xyz.openbmc_project.Inventory.Item.PowerSupply": 120,
+        "xyz.openbmc_project.Inventory.Item.Battery": 121,
+        "xyz.openbmc_project.Inventory.Item.Vrm": 123,
+        "xyz.openbmc_project.Inventory.Item.Cpu": 135,
+        "xyz.openbmc_project.Inventory.Item.Bmc": 137,
+        "xyz.openbmc_project.Inventory.Item.Connector": 185,
+        "xyz.openbmc_project.Inventory.Item.PCIeSlot": 186,
+        "xyz.openbmc_project.Inventory.Item.System": 11521,
+        "xyz.openbmc_project.Inventory.Item.Tpm": 24576
+    }
 }
diff --git a/libpldmresponder/test/fru_jsons/good/Board_General.json b/libpldmresponder/test/fru_jsons/good/Board_General.json
index d4efdab..79b9acf 100644
--- a/libpldmresponder/test/fru_jsons/good/Board_General.json
+++ b/libpldmresponder/test/fru_jsons/good/Board_General.json
@@ -1,29 +1,25 @@
 {
-   "record_details":
-   {
-        "fru_record_type" : 1,
+    "record_details": {
+        "fru_record_type": 1,
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
-   },
-   "fru_fields":[
-      {
-         "fru_field_type" : 3,
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "PartNumber",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            "fru_field_type": 3,
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "PartNumber",
+                "property_type": "string"
             }
-      },
-      {
-         "fru_field_type" : 4,
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "SerialNumber",
-               "property_type" : "string"
+        },
+        {
+            "fru_field_type": 4,
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "SerialNumber",
+                "property_type": "string"
             }
-      }
+        }
     ]
 }
-
diff --git a/libpldmresponder/test/fru_jsons/good/Board_VINI.json b/libpldmresponder/test/fru_jsons/good/Board_VINI.json
index 1ef87ef..c14f7c3 100644
--- a/libpldmresponder/test/fru_jsons/good/Board_VINI.json
+++ b/libpldmresponder/test/fru_jsons/good/Board_VINI.json
@@ -1,30 +1,25 @@
 {
-   "record_details":
-   {
-        "fru_record_type" : 254,
+    "record_details": {
+        "fru_record_type": 254,
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Board"
-   },
-   "fru_fields":[
-      {
-         "fru_field_type" : 2,
-         "dbus":
-            {
-               "interface" : "com.ibm.ipzvpd.VINI",
-               "property_name" : "RT",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            "fru_field_type": 2,
+            "dbus": {
+                "interface": "com.ibm.ipzvpd.VINI",
+                "property_name": "RT",
+                "property_type": "string"
             }
-      },
-      {
-         "fru_field_type" : 3,
-         "dbus":
-            {
-               "interface" : "com.ibm.ipzvpd.VINI",
-               "property_name" : "B3",
-               "property_type" : "bytearray"
+        },
+        {
+            "fru_field_type": 3,
+            "dbus": {
+                "interface": "com.ibm.ipzvpd.VINI",
+                "property_name": "B3",
+                "property_type": "bytearray"
             }
-      }
-
+        }
     ]
 }
-
diff --git a/libpldmresponder/test/fru_jsons/good/Cpu_General.json b/libpldmresponder/test/fru_jsons/good/Cpu_General.json
index 01a378a..8f3d3be 100644
--- a/libpldmresponder/test/fru_jsons/good/Cpu_General.json
+++ b/libpldmresponder/test/fru_jsons/good/Cpu_General.json
@@ -1,28 +1,25 @@
 {
-   "record_details":
-   {
-        "fru_record_type" : 1,
+    "record_details": {
+        "fru_record_type": 1,
         "fru_encoding_type": 1,
         "dbus_interface_name": "xyz.openbmc_project.Inventory.Item.Cpu"
-   },
-   "fru_fields":[
-      {
-         "fru_field_type" : 3,
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "PartNumber",
-               "property_type" : "string"
+    },
+    "fru_fields": [
+        {
+            "fru_field_type": 3,
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "PartNumber",
+                "property_type": "string"
             }
-      },
-      {
-         "fru_field_type" : 4,
-         "dbus":
-            {
-               "interface" : "xyz.openbmc_project.Inventory.Decorator.Asset",
-               "property_name" : "SerialNumber",
-               "property_type" : "string"
+        },
+        {
+            "fru_field_type": 4,
+            "dbus": {
+                "interface": "xyz.openbmc_project.Inventory.Decorator.Asset",
+                "property_name": "SerialNumber",
+                "property_type": "string"
             }
-      }
+        }
     ]
 }
diff --git a/libpldmresponder/test/fru_jsons/good/FRU_Master.json b/libpldmresponder/test/fru_jsons/good/FRU_Master.json
index fa2c405..9444d80 100644
--- a/libpldmresponder/test/fru_jsons/good/FRU_Master.json
+++ b/libpldmresponder/test/fru_jsons/good/FRU_Master.json
@@ -1,14 +1,14 @@
 {
-    "service":"xyz.openbmc_project.Inventory.Manager",
-    "root_path":"/xyz/openbmc_project/inventory/system/",
-    "entities":[
+    "service": "xyz.openbmc_project.Inventory.Manager",
+    "root_path": "/xyz/openbmc_project/inventory/system/",
+    "entities": [
         {
-            "interface" : "xyz.openbmc_project.Inventory.Item.Board",
-            "entity_type" : 64
+            "interface": "xyz.openbmc_project.Inventory.Item.Board",
+            "entity_type": 64
         },
         {
-            "interface" : "xyz.openbmc_project.Inventory.Item.Cpu",
-            "entity_type" : 135
+            "interface": "xyz.openbmc_project.Inventory.Item.Cpu",
+            "entity_type": 135
         }
     ]
 }
diff --git a/libpldmresponder/test/pdr_jsons/state_effecter/good/effecter_pdr.json b/libpldmresponder/test/pdr_jsons/state_effecter/good/effecter_pdr.json
index 1514a59..1143153 100644
--- a/libpldmresponder/test/pdr_jsons/state_effecter/good/effecter_pdr.json
+++ b/libpldmresponder/test/pdr_jsons/state_effecter/good/effecter_pdr.json
@@ -13,9 +13,7 @@
                             "set": {
                                 "id": 196,
                                 "size": 1,
-                                "states": [
-                                    1
-                                ]
+                                "states": [1]
                             },
                             "dbus": {
                                 "path": "/foo/bar",
@@ -31,10 +29,7 @@
                             "set": {
                                 "id": 196,
                                 "size": 1,
-                                "states": [
-                                    1,
-                                    2
-                                ]
+                                "states": [1, 2]
                             },
                             "dbus": {
                                 "path": "/foo/bar",
@@ -59,9 +54,7 @@
                             "set": {
                                 "id": 197,
                                 "size": 1,
-                                "states": [
-                                    1
-                                ]
+                                "states": [1]
                             },
                             "dbus": {
                                 "path": "/foo/bar",
@@ -77,12 +70,7 @@
                             "set": {
                                 "id": 198,
                                 "size": 2,
-                                "states": [
-                                    1,
-                                    2,
-                                    5,
-                                    15
-                                ]
+                                "states": [1, 2, 5, 15]
                             },
                             "dbus": {
                                 "path": "/foo/bar",
@@ -124,4 +112,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/libpldmresponder/test/pdr_jsons/state_sensor/good/sensor_pdr.json b/libpldmresponder/test/pdr_jsons/state_sensor/good/sensor_pdr.json
index 5e1141a..637ccb5 100644
--- a/libpldmresponder/test/pdr_jsons/state_sensor/good/sensor_pdr.json
+++ b/libpldmresponder/test/pdr_jsons/state_sensor/good/sensor_pdr.json
@@ -1,36 +1,33 @@
 {
-  "sensorPDRs": [
-    {
-      "pdrType": 4,
-      "entries": [
+    "sensorPDRs": [
         {
-          "type": 5,
-          "instance": 0,
-          "container": 0,
-          "sensors": [
-            {
-              "set": {
-                "id": 1,
-                "size": 1,
-                "states": [
-                  0,
-                  5
-                ]
-              },
-              "dbus": {
-                "path": "/foo/bar",
-                "interface": "xyz.openbmc_project.Foo.Bar",
-                "property_name": "propertyName",
-                "property_type": "string",
-                "property_values": [
-                  "xyz.openbmc_project.Foo.Bar.V0",
-                  "xyz.openbmc_project.Foo.Bar.V5"
-                ]
-              }
-            }
-          ]
+            "pdrType": 4,
+            "entries": [
+                {
+                    "type": 5,
+                    "instance": 0,
+                    "container": 0,
+                    "sensors": [
+                        {
+                            "set": {
+                                "id": 1,
+                                "size": 1,
+                                "states": [0, 5]
+                            },
+                            "dbus": {
+                                "path": "/foo/bar",
+                                "interface": "xyz.openbmc_project.Foo.Bar",
+                                "property_name": "propertyName",
+                                "property_type": "string",
+                                "property_values": [
+                                    "xyz.openbmc_project.Foo.Bar.V0",
+                                    "xyz.openbmc_project.Foo.Bar.V5"
+                                ]
+                            }
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    ]
+}