diff --git a/ixwebsocket/IXHttpClient.cpp b/ixwebsocket/IXHttpClient.cpp
index 1a2666bb..275e8284 100644
--- a/ixwebsocket/IXHttpClient.cpp
+++ b/ixwebsocket/IXHttpClient.cpp
@@ -241,8 +241,7 @@ namespace ix
         }
 
         // Make a new cancellation object dealing with transfer timeout
-        isCancellationRequested =
-            makeCancellationRequestWithTimeout(args->transferTimeout, _stop);
+        isCancellationRequested = makeCancellationRequestWithTimeout(args->transferTimeout, _stop);
 
         if (args->verbose)
         {
diff --git a/test/IXCobraToSentryBotTest.cpp b/test/IXCobraToSentryBotTest.cpp
index ec457ca8..27f6d407 100644
--- a/test/IXCobraToSentryBotTest.cpp
+++ b/test/IXCobraToSentryBotTest.cpp
@@ -159,14 +159,8 @@ TEST_CASE("Cobra_to_sentry_bot", "[cobra_bots]")
         // Only run the bot for 3 seconds
         int runtime = 3;
 
-        int64_t sentCount = cobra_to_sentry_bot(config,
-                                                channel,
-                                                filter,
-                                                position,
-                                                sentryClient,
-                                                verbose,
-                                                enableHeartbeat,
-                                                runtime);
+        int64_t sentCount = cobra_to_sentry_bot(
+            config, channel, filter, position, sentryClient, verbose, enableHeartbeat, runtime);
         //
         // We want at least 2 messages to be sent
         //
diff --git a/test/IXCobraToStdoutBotTest.cpp b/test/IXCobraToStdoutBotTest.cpp
index 34fa5dd3..7eef2be4 100644
--- a/test/IXCobraToStdoutBotTest.cpp
+++ b/test/IXCobraToStdoutBotTest.cpp
@@ -96,14 +96,8 @@ TEST_CASE("Cobra_to_stdout_bot", "[cobra_bots]")
         // We could try to capture the output ... not sure how.
         bool fluentd = true;
 
-        int64_t sentCount = ix::cobra_to_stdout_bot(config,
-                                                    channel,
-                                                    filter,
-                                                    position,
-                                                    fluentd,
-                                                    quiet,
-                                                    enableHeartbeat,
-                                                    runtime);
+        int64_t sentCount = ix::cobra_to_stdout_bot(
+            config, channel, filter, position, fluentd, quiet, enableHeartbeat, runtime);
         //
         // We want at least 2 messages to be sent
         //
diff --git a/test/IXGetFreePort.cpp b/test/IXGetFreePort.cpp
index ae603493..3f806ddd 100644
--- a/test/IXGetFreePort.cpp
+++ b/test/IXGetFreePort.cpp
@@ -4,7 +4,7 @@
  *  Copyright (c) 2019 Machine Zone. All rights reserved.
  */
 
-// Using inet_addr will trigger an error on uwp without this 
+// Using inet_addr will trigger an error on uwp without this
 // FIXME: use a different api
 #ifdef _WIN32
 #ifndef _WINSOCK_DEPRECATED_NO_WARNINGS
diff --git a/ws/ws.cpp b/ws/ws.cpp
index f72db971..63fc21dc 100644
--- a/ws/ws.cpp
+++ b/ws/ws.cpp
@@ -19,8 +19,8 @@
 #include <ixwebsocket/IXNetSystem.h>
 #include <ixwebsocket/IXSocket.h>
 #include <ixwebsocket/IXUserAgent.h>
-#include <spdlog/spdlog.h>
 #include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/spdlog.h>
 #include <sstream>
 #include <string>
 
@@ -522,14 +522,8 @@ int main(int argc, char** argv)
     else if (app.got_subcommand("cobra_subscribe"))
     {
         bool enableHeartbeat = true;
-        int64_t sentCount = ix::cobra_to_stdout_bot(cobraConfig,
-                                                    channel,
-                                                    filter,
-                                                    position,
-                                                    fluentd,
-                                                    quiet,
-                                                    enableHeartbeat,
-                                                    runtime);
+        int64_t sentCount = ix::cobra_to_stdout_bot(
+            cobraConfig, channel, filter, position, fluentd, quiet, enableHeartbeat, runtime);
         ret = (int) sentCount;
     }
     else if (app.got_subcommand("cobra_publish"))