diff --git a/tools/handler.cpp b/tools/handler.cpp
index cc73e13..d241b9f 100644
--- a/tools/handler.cpp
+++ b/tools/handler.cpp
@@ -52,15 +52,15 @@
 {
     std::vector<std::string> blobs = blob->getBlobList();
 
-    auto blobInst = std::find_if(
-        blobs.begin(), blobs.end(), [&goalFirmware](const std::string& iter) {
-            /* Running into weird scenarios where the string comparison doesn't
-             * work.  TODO: revisit.
-             */
-            return (0 == std::memcmp(goalFirmware.c_str(), iter.c_str(),
-                                     goalFirmware.length()));
-            // return (goalFirmware.compare(iter));
-        });
+    auto blobInst = std::find_if(blobs.begin(), blobs.end(),
+                                 [&goalFirmware](const std::string& iter) {
+        /* Running into weird scenarios where the string comparison doesn't
+         * work.  TODO: revisit.
+         */
+        return (0 == std::memcmp(goalFirmware.c_str(), iter.c_str(),
+                                 goalFirmware.length()));
+        // return (goalFirmware.compare(iter));
+    });
     if (blobInst == blobs.end())
     {
         std::fprintf(stderr, "%s not found\n", goalFirmware.c_str());
