diff --git a/gpio-util/gpio.cpp b/gpio-util/gpio.cpp
index c6b7704..0b671a8 100644
--- a/gpio-util/gpio.cpp
+++ b/gpio-util/gpio.cpp
@@ -18,9 +18,10 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <cassert>
 #include <phosphor-logging/log.hpp>
 
+#include <cassert>
+
 namespace phosphor
 {
 namespace gpio
diff --git a/gpio-util/gpio.hpp b/gpio-util/gpio.hpp
index bcb036c..46b6fba 100644
--- a/gpio-util/gpio.hpp
+++ b/gpio-util/gpio.hpp
@@ -62,8 +62,7 @@
      */
     GPIO(const std::string& device, gpioNum_t gpio, Direction direction) :
         device(device), gpio(gpio), direction(direction)
-    {
-    }
+    {}
 
     /**
      * Sets the GPIO value
diff --git a/gpio-util/main.cpp b/gpio-util/main.cpp
index 82cbed4..27da697 100644
--- a/gpio-util/main.cpp
+++ b/gpio-util/main.cpp
@@ -26,11 +26,12 @@
 #include "argument.hpp"
 #include "gpio.hpp"
 
+#include <phosphor-logging/log.hpp>
+
 #include <algorithm>
 #include <chrono>
 #include <iostream>
 #include <map>
-#include <phosphor-logging/log.hpp>
 #include <thread>
 
 using namespace phosphor::gpio;