diff --git a/presence/config_files/p10bmc/ibm,bonnell/config.json b/presence/config_files/p10bmc/ibm,bonnell/config.json
index 4fed0ca..1cd3b24 100644
--- a/presence/config_files/p10bmc/ibm,bonnell/config.json
+++ b/presence/config_files/p10bmc/ibm,bonnell/config.json
@@ -1,46 +1,40 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "BMC",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "BMC",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "BMC",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "BMC",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,everest/config.json b/presence/config_files/p10bmc/ibm,everest/config.json
index 3ee7500..0fe01b0 100644
--- a/presence/config_files/p10bmc/ibm,everest/config.json
+++ b/presence/config_files/p10bmc/ibm,everest/config.json
@@ -1,110 +1,98 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 15,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "31-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 14,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "32-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 13,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "33-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 12,
-            "physpath": "/sys/bus/i2c/devices/30-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      },
-      "eeprom": {
-          "bus_address": "34-0050",
-          "driver_name": "at24",
-          "bind_delay_ms": 1000
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 15,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "31-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 14,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "32-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 13,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "33-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 12,
+                "physpath": "/sys/bus/i2c/devices/30-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        },
+        "eeprom": {
+            "bus_address": "34-0050",
+            "driver_name": "at24",
+            "bind_delay_ms": 1000
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json b/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
index 65697e5..b17359b 100644
--- a/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-1s4u/config.json
@@ -1,86 +1,78 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-2u/config.json b/presence/config_files/p10bmc/ibm,rainier-2u/config.json
index a5cc1bf..f06ca9f 100644
--- a/presence/config_files/p10bmc/ibm,rainier-2u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-2u/config.json
@@ -1,134 +1,116 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0",
-               "fan4_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0",
-               "fan5_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 9,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0", "fan4_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan5",
+        "path": "/system/chassis/motherboard/fan5",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 11,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan5_0", "fan5_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/p10bmc/ibm,rainier-4u/config.json b/presence/config_files/p10bmc/ibm,rainier-4u/config.json
index 620a329..854ff8e 100644
--- a/presence/config_files/p10bmc/ibm,rainier-4u/config.json
+++ b/presence/config_files/p10bmc/ibm,rainier-4u/config.json
@@ -1,128 +1,116 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 8,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 9,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan4",
-      "path": "/system/chassis/motherboard/fan4",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 10,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan4_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan5",
-      "path": "/system/chassis/motherboard/fan5",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 11,
-            "physpath": "/sys/bus/i2c/devices/7-0061",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan5_0"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 8,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 9,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan4",
+        "path": "/system/chassis/motherboard/fan4",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 10,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan4_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan5",
+        "path": "/system/chassis/motherboard/fan5",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 11,
+                "physpath": "/sys/bus/i2c/devices/7-0061",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan5_0"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/config_files/witherspoon/config.json b/presence/config_files/witherspoon/config.json
index 52262fe..7365a81 100644
--- a/presence/config_files/witherspoon/config.json
+++ b/presence/config_files/witherspoon/config.json
@@ -1,90 +1,78 @@
 [
-   {
-      "name": "fan0",
-      "path": "/system/chassis/motherboard/fan0",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 4,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan0_0",
-               "fan0_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan1",
-      "path": "/system/chassis/motherboard/fan1",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 5,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan1_0",
-               "fan1_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan2",
-      "path": "/system/chassis/motherboard/fan2",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 6,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan2_0",
-               "fan2_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   },
-   {
-      "name": "fan3",
-      "path": "/system/chassis/motherboard/fan3",
-      "methods": [
-         {
-            "type": "gpio",
-            "key": 7,
-            "physpath": "/sys/bus/i2c/devices/3-0060",
-            "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-         },
-         {
-            "type": "tach",
-            "sensors": [
-               "fan3_0",
-               "fan3_1"
-            ]
-         }
-      ],
-      "rpolicy": {
-         "type": "anyof"
-      }
-   }
+    {
+        "name": "fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 4,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan0_0", "fan0_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 5,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan1_0", "fan1_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 6,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2_0", "fan2_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    },
+    {
+        "name": "fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 7,
+                "physpath": "/sys/bus/i2c/devices/3-0060",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3_0", "fan3_1"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
+    }
 ]
diff --git a/presence/example/config.json b/presence/example/config.json
index 08883b7..52bfbf0 100644
--- a/presence/example/config.json
+++ b/presence/example/config.json
@@ -1,100 +1,94 @@
 [
-  {
-    "comments": [
-      "Example fan with tach feedback detection method. Fans without any",
-      "special presence detection hardware can use one or more tach speed",
-      "sensor feedbacks as an indicator of presence. Listed sensors are",
-      "expected to be found in the /xyz/openbmc_project/sensors/fan_tach",
-      "namespace as required by the OpenBMC DBus API. Supported policy types",
-      "are fallback or anyof. The fan_missing_error_time value is the amount",
-      "of time in seconds that a fan must be missing before an event log is",
-      "created."
-    ],
-    "name": "Example Fan0",
-    "path": "/system/chassis/motherboard/fan0",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "tach",
-        "sensors": [
-          "fan0"
+    {
+        "comments": [
+            "Example fan with tach feedback detection method. Fans without any",
+            "special presence detection hardware can use one or more tach speed",
+            "sensor feedbacks as an indicator of presence. Listed sensors are",
+            "expected to be found in the /xyz/openbmc_project/sensors/fan_tach",
+            "namespace as required by the OpenBMC DBus API. Supported policy types",
+            "are fallback or anyof. The fan_missing_error_time value is the amount",
+            "of time in seconds that a fan must be missing before an event log is",
+            "created."
+        ],
+        "name": "Example Fan0",
+        "path": "/system/chassis/motherboard/fan0",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "tach",
+                "sensors": ["fan0"]
+            }
         ]
-      }
-    ]
-  },
-  {
-    "comments": [
-      "Example fan with gpio detection method. Fans with dedicated gpios can",
-      "use the gpio detection method. The gpio detection uses Linux gpio-keys,",
-      "where the event number is provided via the `key` property."
-    ],
-    "name": "Example Fan1",
-    "path": "/system/chassis/motherboard/fan1",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 123,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-event"
-      }
-    ]
-  },
-  {
-    "comments": [
-      "Example fan with fallback redundancy policy. Multiple detection methods",
-      "for a single fan are allowed. When multiple detection methods are",
-      "provided a redundancy algorithm must be specified with the rpolicy",
-      "attribute. Note that the redundancy policy algorithm may or may not",
-      "factor the order the detection methods are listed into its logic. The",
-      "fallback algorithm falls back to subsequently listed detection methods",
-      "when the first method does not detect a fan and the second method does."
-    ],
-    "name": "Example Fan2",
-    "path": "/system/chassis/motherboard/fan2",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 124,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-      },
-      {
-        "type": "tach",
-        "sensors": [
-          "fan2"
+    },
+    {
+        "comments": [
+            "Example fan with gpio detection method. Fans with dedicated gpios can",
+            "use the gpio detection method. The gpio detection uses Linux gpio-keys,",
+            "where the event number is provided via the `key` property."
+        ],
+        "name": "Example Fan1",
+        "path": "/system/chassis/motherboard/fan1",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 123,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-event"
+            }
         ]
-      }
-    ],
-    "rpolicy": {
-      "type": "fallback"
+    },
+    {
+        "comments": [
+            "Example fan with fallback redundancy policy. Multiple detection methods",
+            "for a single fan are allowed. When multiple detection methods are",
+            "provided a redundancy algorithm must be specified with the rpolicy",
+            "attribute. Note that the redundancy policy algorithm may or may not",
+            "factor the order the detection methods are listed into its logic. The",
+            "fallback algorithm falls back to subsequently listed detection methods",
+            "when the first method does not detect a fan and the second method does."
+        ],
+        "name": "Example Fan2",
+        "path": "/system/chassis/motherboard/fan2",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 124,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan2"]
+            }
+        ],
+        "rpolicy": {
+            "type": "fallback"
+        }
+    },
+    {
+        "comments": [
+            "Example fan with anyof redundancy policy. The anyof algorithm reports",
+            "true if any redundancy set component sensors report true."
+        ],
+        "name": "Example Fan3",
+        "path": "/system/chassis/motherboard/fan3",
+        "fan_missing_error_time": 10,
+        "methods": [
+            {
+                "type": "gpio",
+                "key": 125,
+                "physpath": "/sys/devices/foo/bar",
+                "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
+            },
+            {
+                "type": "tach",
+                "sensors": ["fan3"]
+            }
+        ],
+        "rpolicy": {
+            "type": "anyof"
+        }
     }
-  },
-  {
-    "comments": [
-      "Example fan with anyof redundancy policy. The anyof algorithm reports",
-      "true if any redundancy set component sensors report true."
-    ],
-    "name": "Example Fan3",
-    "path": "/system/chassis/motherboard/fan3",
-    "fan_missing_error_time": 10,
-    "methods": [
-      {
-        "type": "gpio",
-        "key": 125,
-        "physpath": "/sys/devices/foo/bar",
-        "devpath": "/dev/input/by-path/platform-gpio-keys-polled-event"
-      },
-      {
-        "type": "tach",
-        "sensors": [
-          "fan3"
-        ]
-      }
-    ],
-    "rpolicy": {
-      "type": "anyof"
-    }
-  }
 ]
diff --git a/presence/example/example.yaml b/presence/example/example.yaml
index 877bd5c..6cf4867 100644
--- a/presence/example/example.yaml
+++ b/presence/example/example.yaml
@@ -10,76 +10,73 @@
 
 - name: Example Fan0
   description: >
-    'Example fan with tach feedback detection method.
+      'Example fan with tach feedback detection method.
 
-    Fans without any special presence detection hardware
-    can use one or more tach speed sensor feedbacks as
-    an indicator of presence.  Listed sensors are expected to
-    be found in the /xyz/openbmc_project/sensors/fan_tach
-    namespace as required by the OpenBMC DBus API.
+      Fans without any special presence detection hardware can use one or more
+      tach speed sensor feedbacks as an indicator of presence.  Listed sensors
+      are expected to be found in the /xyz/openbmc_project/sensors/fan_tach
+      namespace as required by the OpenBMC DBus API.
 
-    Supported policy types are fallback or anyof.'
+      Supported policy types are fallback or anyof.'
   path: /system/chassis/motherboard/fan0
   methods:
-    - type: tach
-      sensors:
-        - fan0
+      - type: tach
+        sensors:
+            - fan0
 
 - name: Example Fan1
   description: >
-    'Example fan with gpio detection method.
+      'Example fan with gpio detection method.
 
-    Fans with dedicated gpios can use the gpio detection
-    method.  The gpio detection uses Linux gpio-keys: the
-    event number must be provided via the key property.'
+      Fans with dedicated gpios can use the gpio detection method.  The gpio
+      detection uses Linux gpio-keys: the event number must be provided via the
+      key property.'
   path: /system/chassis/motherboard/fan1
   methods:
-    - type: gpio
-      key: 123
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-event
+      - type: gpio
+        key: 123
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-event
 
 - name: Example Fan2
   description: >
-    'Example fan with fallback redundancy policy.
+      'Example fan with fallback redundancy policy.
 
-    Multiple detection methods for a single fan are allowed.
-    When multiple detection methods are provided a redundancy
-    algorithm must be specified with the rpolicy attribute.
+      Multiple detection methods for a single fan are allowed. When multiple
+      detection methods are provided a redundancy algorithm must be specified
+      with the rpolicy attribute.
 
-    Note that the redundancy policy algorithm may or may not
-    factor the order the detection methods are listed into
-    its logic.
+      Note that the redundancy policy algorithm may or may not factor the order
+      the detection methods are listed into its logic.
 
-    The fallback algorithm falls back to subsequently listed
-    detection methods when the first method does not detect
-    a fan and the second method does.'
+      The fallback algorithm falls back to subsequently listed detection methods
+      when the first method does not detect a fan and the second method does.'
   path: /system/chassis/motherboard/fan2
   methods:
-    - type: gpio
-      key: 124
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan2
+      - type: gpio
+        key: 124
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-polled-event
+      - type: tach
+        sensors:
+            - fan2
   rpolicy:
-    type: fallback
+      type: fallback
 
 - name: Example Fan3
   description: >
-    'Example fan with anyof redundancy policy.
+      'Example fan with anyof redundancy policy.
 
-    The anyof algorithm reports true if any redundancy set
-    component sensors report true.'
+      The anyof algorithm reports true if any redundancy set component sensors
+      report true.'
   path: /system/chassis/motherboard/fan3
   methods:
-    - type: gpio
-      key: 125
-      physpath: /sys/devices/foo/bar
-      devpath: /dev/input/by-path/platform-gpio-keys-polled-event
-    - type: tach
-      sensors:
-        - fan3
+      - type: gpio
+        key: 125
+        physpath: /sys/devices/foo/bar
+        devpath: /dev/input/by-path/platform-gpio-keys-polled-event
+      - type: tach
+        sensors:
+            - fan3
   rpolicy:
-    type: anyof
+      type: anyof