diff --git a/include/cpuinfo.hpp b/include/cpuinfo.hpp
index 2ac5b37..200041b 100644
--- a/include/cpuinfo.hpp
+++ b/include/cpuinfo.hpp
@@ -23,9 +23,9 @@
 
 namespace cpu_info
 {
-static constexpr char const* cpuInfoObject = "xyz.openbmc_project.CPUInfo";
-static constexpr char const* cpuInfoPath = "/xyz/openbmc_project/CPUInfo";
-static constexpr char const* cpuInfoInterface = "xyz.openbmc_project.CPUInfo";
+static constexpr const char* cpuInfoObject = "xyz.openbmc_project.CPUInfo";
+static constexpr const char* cpuInfoPath = "/xyz/openbmc_project/CPUInfo";
+static constexpr const char* cpuInfoInterface = "xyz.openbmc_project.CPUInfo";
 static constexpr const char* cpuPath =
     "/xyz/openbmc_project/inventory/system/chassis/motherboard/cpu";
 
diff --git a/include/mdrv2.hpp b/include/mdrv2.hpp
index c9396e2..e53545f 100644
--- a/include/mdrv2.hpp
+++ b/include/mdrv2.hpp
@@ -78,7 +78,6 @@
         bus(bus), timer(io), smbiosInterface(getObjectServer().add_interface(
                                  smbiosPath, smbiosInterfaceName))
     {
-
         smbiosDir.agentVersion = smbiosAgentVersion;
         smbiosDir.dirVersion = 1;
         smbiosDir.dirEntries = 1;
diff --git a/include/smbios_mdrv2.hpp b/include/smbios_mdrv2.hpp
index 0ac77b9..0b4638a 100644
--- a/include/smbios_mdrv2.hpp
+++ b/include/smbios_mdrv2.hpp
@@ -229,7 +229,6 @@
         uint32_t len = *(smbiosData + 1);
         if (*smbiosData != typeId)
         {
-
             smbiosData += len;
             while ((*smbiosData != '\0') || (*(smbiosData + 1) != '\0'))
             {
diff --git a/include/speed_select.hpp b/include/speed_select.hpp
index 9cdc450..1c6944f 100644
--- a/include/speed_select.hpp
+++ b/include/speed_select.hpp
@@ -66,8 +66,7 @@
 class SSTInterface
 {
   public:
-    virtual ~SSTInterface()
-    {}
+    virtual ~SSTInterface() {}
 
     /**
      * Whether the interface is ready to be used, or we need to wait longer. The