diff --git a/ubi/activation_ubi.cpp b/ubi/activation_ubi.cpp
index 383dc51..97358e8 100644
--- a/ubi/activation_ubi.cpp
+++ b/ubi/activation_ubi.cpp
@@ -3,9 +3,10 @@
 #include "item_updater.hpp"
 #include "serialize.hpp"
 
-#include <experimental/filesystem>
 #include <phosphor-logging/log.hpp>
 
+#include <experimental/filesystem>
+
 namespace openpower
 {
 namespace software
diff --git a/ubi/item_updater_ubi.cpp b/ubi/item_updater_ubi.cpp
index ae6b3fd..ee87965 100644
--- a/ubi/item_updater_ubi.cpp
+++ b/ubi/item_updater_ubi.cpp
@@ -8,13 +8,14 @@
 #include "version.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"
 
-#include <experimental/filesystem>
-#include <fstream>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/log.hpp>
+#include <xyz/openbmc_project/Software/Version/server.hpp>
+
+#include <experimental/filesystem>
+#include <fstream>
 #include <queue>
 #include <string>
-#include <xyz/openbmc_project/Software/Version/server.hpp>
 
 namespace openpower
 {
diff --git a/ubi/serialize.cpp b/ubi/serialize.cpp
index a40925a..e047b87 100644
--- a/ubi/serialize.cpp
+++ b/ubi/serialize.cpp
@@ -3,9 +3,10 @@
 #include "serialize.hpp"
 
 #include <cereal/archives/json.hpp>
+#include <sdbusplus/server.hpp>
+
 #include <experimental/filesystem>
 #include <fstream>
-#include <sdbusplus/server.hpp>
 
 namespace openpower
 {
@@ -107,8 +108,7 @@
         }
     }
     catch (const std::exception& e)
-    {
-    }
+    {}
 
     return false;
 }
diff --git a/ubi/watch.cpp b/ubi/watch.cpp
index 60d0014..fd2cad2 100644
--- a/ubi/watch.cpp
+++ b/ubi/watch.cpp
@@ -7,11 +7,12 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
+#include <phosphor-logging/log.hpp>
+
 #include <cstddef>
 #include <cstring>
 #include <experimental/filesystem>
 #include <functional>
-#include <phosphor-logging/log.hpp>
 #include <stdexcept>
 #include <string>
 
diff --git a/ubi/watch.hpp b/ubi/watch.hpp
index 2e0ec17..2628e93 100644
--- a/ubi/watch.hpp
+++ b/ubi/watch.hpp
@@ -42,8 +42,7 @@
      *  @param[in] fd - File descriptor
      */
     explicit CustomFd(int fd) : fd(fd)
-    {
-    }
+    {}
 
     ~CustomFd()
     {