diff --git a/mainloop.hpp b/mainloop.hpp
index c3ed161..77419e5 100644
--- a/mainloop.hpp
+++ b/mainloop.hpp
@@ -1,18 +1,19 @@
 #pragma once
 
-#include <string>
-#include <vector>
+#include "hwmonio.hpp"
+#include "interface.hpp"
+#include "sensor.hpp"
+#include "sensorset.hpp"
+#include "sysfs.hpp"
+#include "timer.hpp"
+#include "types.hpp"
+
 #include <experimental/any>
 #include <experimental/optional>
 #include <memory>
 #include <sdbusplus/server.hpp>
-#include "types.hpp"
-#include "hwmonio.hpp"
-#include "sensorset.hpp"
-#include "sysfs.hpp"
-#include "interface.hpp"
-#include "timer.hpp"
-#include "sensor.hpp"
+#include <string>
+#include <vector>
 
 static constexpr auto default_interval = 1000000;
 
@@ -27,116 +28,113 @@
  */
 class MainLoop
 {
-    public:
-        MainLoop() = delete;
-        MainLoop(const MainLoop&) = delete;
-        MainLoop& operator=(const MainLoop&) = delete;
-        MainLoop(MainLoop&&) = default;
-        MainLoop& operator=(MainLoop&&) = default;
-        ~MainLoop() = default;
+  public:
+    MainLoop() = delete;
+    MainLoop(const MainLoop&) = delete;
+    MainLoop& operator=(const MainLoop&) = delete;
+    MainLoop(MainLoop&&) = default;
+    MainLoop& operator=(MainLoop&&) = default;
+    ~MainLoop() = default;
 
-        /** @brief Constructor
-         *
-         *  @param[in] bus - sdbusplus bus client connection.
-         *  @param[in] param - the path parameter provided
-         *  @param[in] path - hwmon sysfs instance to manage
-         *  @param[in] devPath - physical device sysfs path.
-         *  @param[in] prefix - DBus busname prefix.
-         *  @param[in] root - DBus sensors namespace root.
-         *
-         *  Any DBus objects are created relative to the DBus
-         *  sensors namespace root.
-         *
-         *  At startup, the application will own a busname with
-         *  the format <prefix>.hwmon<n>.
-         */
-        MainLoop(
-            sdbusplus::bus::bus&& bus,
-            const std::string& param,
-            const std::string& path,
-            const std::string& devPath,
-            const char* prefix,
-            const char* root);
+    /** @brief Constructor
+     *
+     *  @param[in] bus - sdbusplus bus client connection.
+     *  @param[in] param - the path parameter provided
+     *  @param[in] path - hwmon sysfs instance to manage
+     *  @param[in] devPath - physical device sysfs path.
+     *  @param[in] prefix - DBus busname prefix.
+     *  @param[in] root - DBus sensors namespace root.
+     *
+     *  Any DBus objects are created relative to the DBus
+     *  sensors namespace root.
+     *
+     *  At startup, the application will own a busname with
+     *  the format <prefix>.hwmon<n>.
+     */
+    MainLoop(sdbusplus::bus::bus&& bus, const std::string& param,
+             const std::string& path, const std::string& devPath,
+             const char* prefix, const char* root);
 
-        /** @brief Setup polling timer in a sd event loop and attach to D-Bus
-         *         event loop.
-         */
-        void run();
+    /** @brief Setup polling timer in a sd event loop and attach to D-Bus
+     *         event loop.
+     */
+    void run();
 
-        /** @brief Stop polling timer event loop from another thread.
-         *
-         *  Typically only used by testcases.
-         */
-        void shutdown() noexcept;
+    /** @brief Stop polling timer event loop from another thread.
+     *
+     *  Typically only used by testcases.
+     */
+    void shutdown() noexcept;
 
-    private:
-        using mapped_type = std::tuple<SensorSet::mapped_type, std::string, ObjectInfo>;
-        using SensorState = std::map<SensorSet::key_type, mapped_type>;
+  private:
+    using mapped_type =
+        std::tuple<SensorSet::mapped_type, std::string, ObjectInfo>;
+    using SensorState = std::map<SensorSet::key_type, mapped_type>;
 
-        /** @brief Read hwmon sysfs entries */
-        void read();
+    /** @brief Read hwmon sysfs entries */
+    void read();
 
-        /** @brief Set up D-Bus object state */
-        void init();
+    /** @brief Set up D-Bus object state */
+    void init();
 
-        /** @brief sdbusplus bus client connection. */
-        sdbusplus::bus::bus _bus;
-        /** @brief sdbusplus freedesktop.ObjectManager storage. */
-        sdbusplus::server::manager::manager _manager;
-        /** @brief the parameter path used. */
-        std::string _pathParam;
-        /** @brief hwmon sysfs class path. */
-        std::string _hwmonRoot;
-        /** @brief hwmon sysfs instance. */
-        std::string _instance;
-        /** @brief physical device sysfs path. */
-        std::string _devPath;
-        /** @brief DBus busname prefix. */
-        const char* _prefix;
-        /** @brief DBus sensors namespace root. */
-        const char* _root;
-        /** @brief DBus object state. */
-        SensorState state;
-        /** @brief Sleep interval in microseconds. */
-        uint64_t _interval = default_interval;
-        /** @brief Hwmon sysfs access. */
-        hwmonio::HwmonIO ioAccess;
-        /** @brief Timer */
-        std::unique_ptr<phosphor::hwmon::Timer> timer;
-        /** @brief the sd_event structure */
-        sd_event* loop = nullptr;
-        /** @brief Store the specifications of sensor objects */
-        std::map<SensorSet::key_type,
-                 std::unique_ptr<sensor::Sensor>> sensorObjects;
+    /** @brief sdbusplus bus client connection. */
+    sdbusplus::bus::bus _bus;
+    /** @brief sdbusplus freedesktop.ObjectManager storage. */
+    sdbusplus::server::manager::manager _manager;
+    /** @brief the parameter path used. */
+    std::string _pathParam;
+    /** @brief hwmon sysfs class path. */
+    std::string _hwmonRoot;
+    /** @brief hwmon sysfs instance. */
+    std::string _instance;
+    /** @brief physical device sysfs path. */
+    std::string _devPath;
+    /** @brief DBus busname prefix. */
+    const char* _prefix;
+    /** @brief DBus sensors namespace root. */
+    const char* _root;
+    /** @brief DBus object state. */
+    SensorState state;
+    /** @brief Sleep interval in microseconds. */
+    uint64_t _interval = default_interval;
+    /** @brief Hwmon sysfs access. */
+    hwmonio::HwmonIO ioAccess;
+    /** @brief Timer */
+    std::unique_ptr<phosphor::hwmon::Timer> timer;
+    /** @brief the sd_event structure */
+    sd_event* loop = nullptr;
+    /** @brief Store the specifications of sensor objects */
+    std::map<SensorSet::key_type, std::unique_ptr<sensor::Sensor>>
+        sensorObjects;
 
-        /**
-         * @brief Map of removed sensors
-         */
-        std::map<SensorSet::key_type, SensorSet::mapped_type> rmSensors;
+    /**
+     * @brief Map of removed sensors
+     */
+    std::map<SensorSet::key_type, SensorSet::mapped_type> rmSensors;
 
-        /**
-         * @brief Get the ID of the sensor
-         *
-         * @param[in] sensor - Sensor to get the ID of
-         */
-        std::string getID(SensorSet::container_t::const_reference sensor);
+    /**
+     * @brief Get the ID of the sensor
+     *
+     * @param[in] sensor - Sensor to get the ID of
+     */
+    std::string getID(SensorSet::container_t::const_reference sensor);
 
-        /**
-         * @brief Get the sensor identifiers
-         *
-         * @param[in] sensor - Sensor to get the identifiers of
-         */
-        SensorIdentifiers getIdentifiers(
-                SensorSet::container_t::const_reference sensor);
+    /**
+     * @brief Get the sensor identifiers
+     *
+     * @param[in] sensor - Sensor to get the identifiers of
+     */
+    SensorIdentifiers
+        getIdentifiers(SensorSet::container_t::const_reference sensor);
 
-        /**
-         * @brief Used to create and add sensor objects
-         *
-         * @param[in] sensor - Sensor to create/add object for
-         *
-         * @return - Optional
-         *     Object state data on success, nothing on failure
-         */
-        optional_ns::optional<ObjectStateData> getObject(
-                SensorSet::container_t::const_reference sensor);
+    /**
+     * @brief Used to create and add sensor objects
+     *
+     * @param[in] sensor - Sensor to create/add object for
+     *
+     * @return - Optional
+     *     Object state data on success, nothing on failure
+     */
+    optional_ns::optional<ObjectStateData>
+        getObject(SensorSet::container_t::const_reference sensor);
 };