diff --git a/elog_entry.hpp b/elog_entry.hpp
index 5ee8f5f..abcfe50 100644
--- a/elog_entry.hpp
+++ b/elog_entry.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <sdbusplus/bus.hpp>
-#include <sdbusplus/server/object.hpp>
+#include "org/openbmc/Associations/server.hpp"
 #include "xyz/openbmc_project/Logging/Entry/server.hpp"
 #include "xyz/openbmc_project/Object/Delete/server.hpp"
 #include "xyz/openbmc_project/Software/Version/server.hpp"
-#include "org/openbmc/Associations/server.hpp"
+
+#include <sdbusplus/bus.hpp>
+#include <sdbusplus/server/object.hpp>
 
 namespace phosphor
 {
@@ -19,7 +20,7 @@
     sdbusplus::xyz::openbmc_project::Software::server::Version>;
 
 using AssociationList =
-     std::vector<std::tuple<std::string, std::string, std::string>>;
+    std::vector<std::tuple<std::string, std::string, std::string>>;
 
 namespace internal
 {
@@ -34,104 +35,96 @@
  */
 class Entry : public EntryIfaces
 {
-    public:
-        Entry() = delete;
-        Entry(const Entry&) = delete;
-        Entry& operator=(const Entry&) = delete;
-        Entry(Entry&&) = delete;
-        Entry& operator=(Entry&&) = delete;
-        virtual ~Entry() = default;
+  public:
+    Entry() = delete;
+    Entry(const Entry&) = delete;
+    Entry& operator=(const Entry&) = delete;
+    Entry(Entry&&) = delete;
+    Entry& operator=(Entry&&) = delete;
+    virtual ~Entry() = default;
 
-        /** @brief Constructor to put object onto bus at a dbus path.
-         *         Defer signal registration (pass true for deferSignal to the
-         *         base class) until after the properties are set.
-         *  @param[in] bus - Bus to attach to.
-         *  @param[in] path - Path to attach at.
-         *  @param[in] idErr - The error entry id.
-         *  @param[in] timestampErr - The commit timestamp.
-         *  @param[in] severityErr - The severity of the error.
-         *  @param[in] msgErr - The message of the error.
-         *  @param[in] additionalDataErr - The error metadata.
-         *  @param[in] objects - The list of associations.
-         *  @param[in] fwVersion - The BMC code version.
-         *  @param[in] parent - The error's parent.
-         */
-        Entry(sdbusplus::bus::bus& bus,
-              const std::string& path,
-              uint32_t idErr,
-              uint64_t timestampErr,
-              Level severityErr,
-              std::string&& msgErr,
-              std::vector<std::string>&& additionalDataErr,
-              AssociationList&& objects,
-              const std::string& fwVersion,
-              internal::Manager& parent) :
-              EntryIfaces(bus, path.c_str(), true),
-              parent(parent)
-        {
-            id(idErr);
-            severity(severityErr);
-            timestamp(timestampErr);
-            message(std::move(msgErr));
-            additionalData(std::move(additionalDataErr));
-            associations(std::move(objects));
-            // Store a copy of associations in case we need to recreate
-            assocs = associations();
-            sdbusplus::xyz::openbmc_project::
-                Logging::server::Entry::resolved(false);
+    /** @brief Constructor to put object onto bus at a dbus path.
+     *         Defer signal registration (pass true for deferSignal to the
+     *         base class) until after the properties are set.
+     *  @param[in] bus - Bus to attach to.
+     *  @param[in] path - Path to attach at.
+     *  @param[in] idErr - The error entry id.
+     *  @param[in] timestampErr - The commit timestamp.
+     *  @param[in] severityErr - The severity of the error.
+     *  @param[in] msgErr - The message of the error.
+     *  @param[in] additionalDataErr - The error metadata.
+     *  @param[in] objects - The list of associations.
+     *  @param[in] fwVersion - The BMC code version.
+     *  @param[in] parent - The error's parent.
+     */
+    Entry(sdbusplus::bus::bus& bus, const std::string& path, uint32_t idErr,
+          uint64_t timestampErr, Level severityErr, std::string&& msgErr,
+          std::vector<std::string>&& additionalDataErr,
+          AssociationList&& objects, const std::string& fwVersion,
+          internal::Manager& parent) :
+        EntryIfaces(bus, path.c_str(), true),
+        parent(parent)
+    {
+        id(idErr);
+        severity(severityErr);
+        timestamp(timestampErr);
+        message(std::move(msgErr));
+        additionalData(std::move(additionalDataErr));
+        associations(std::move(objects));
+        // Store a copy of associations in case we need to recreate
+        assocs = associations();
+        sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(
+            false);
 
-            version(fwVersion);
-            purpose(VersionPurpose::BMC);
+        version(fwVersion);
+        purpose(VersionPurpose::BMC);
 
-            // Emit deferred signal.
-            this->emit_object_added();
-        };
+        // Emit deferred signal.
+        this->emit_object_added();
+    };
 
-        /** @brief Constructor that puts an "empty" error object on the bus,
-         *         with only the id property populated. Rest of the properties
-         *         to be set by the caller. Caller should emit the added signal.
-         *  @param[in] bus - Bus to attach to.
-         *  @param[in] path - Path to attach at.
-         *  @param[in] id - The error entry id.
-         *  @param[in] parent - The error's parent.
-         */
-        Entry(sdbusplus::bus::bus& bus,
-              const std::string& path,
-              uint32_t entryId,
-              internal::Manager& parent) :
-              EntryIfaces(bus, path.c_str(), true),
-              parent(parent)
-        {
-            id(entryId);
-        };
+    /** @brief Constructor that puts an "empty" error object on the bus,
+     *         with only the id property populated. Rest of the properties
+     *         to be set by the caller. Caller should emit the added signal.
+     *  @param[in] bus - Bus to attach to.
+     *  @param[in] path - Path to attach at.
+     *  @param[in] id - The error entry id.
+     *  @param[in] parent - The error's parent.
+     */
+    Entry(sdbusplus::bus::bus& bus, const std::string& path, uint32_t entryId,
+          internal::Manager& parent) :
+        EntryIfaces(bus, path.c_str(), true),
+        parent(parent)
+    {
+        id(entryId);
+    };
 
-        /** @brief Set resolution status of the error.
-         *  @param[in] value - boolean indicating resolution
-         *  status (true = resolved)
-         *  @returns value of 'Resolved' property
-         */
-        bool resolved(bool value) override;
+    /** @brief Set resolution status of the error.
+     *  @param[in] value - boolean indicating resolution
+     *  status (true = resolved)
+     *  @returns value of 'Resolved' property
+     */
+    bool resolved(bool value) override;
 
-        using sdbusplus::xyz::openbmc_project::
-              Logging::server::Entry::resolved;
+    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved;
 
-        /** @brief Delete this d-bus object.
-         */
-        void delete_() override;
+    /** @brief Delete this d-bus object.
+     */
+    void delete_() override;
 
-        /** @brief Severity level to check in cap.
-         *  @details Errors with severity lesser than this will be
-         *           considered as low priority and maximum ERROR_INFO_CAP
-         *           number errors of this category will be captured.
-        */
-        static constexpr auto sevLowerLimit = Entry::Level::Informational;
+    /** @brief Severity level to check in cap.
+     *  @details Errors with severity lesser than this will be
+     *           considered as low priority and maximum ERROR_INFO_CAP
+     *           number errors of this category will be captured.
+     */
+    static constexpr auto sevLowerLimit = Entry::Level::Informational;
 
-    private:
-        /** @brief This entry's associations */
-        AssociationList assocs = {};
+  private:
+    /** @brief This entry's associations */
+    AssociationList assocs = {};
 
-        /** @brief This entry's parent */
-        internal::Manager& parent;
+    /** @brief This entry's parent */
+    internal::Manager& parent;
 };
 
 } // namespace logging