diff --git a/native/android/app/src/main/java/app/comm/android/fbjni/NetworkModule.java b/native/android/app/src/main/java/app/comm/android/fbjni/NetworkModule.java
--- a/native/android/app/src/main/java/app/comm/android/fbjni/NetworkModule.java
+++ b/native/android/app/src/main/java/app/comm/android/fbjni/NetworkModule.java
@@ -1,3 +1,5 @@
 package app.comm.android.fbjni;
 
-public class NetworkModule { public static native void sendPong(); }
+public class NetworkModule {
+  public static native void sendPong();
+}
diff --git a/scripts/get_clang_paths.js b/scripts/get_clang_paths.js
--- a/scripts/get_clang_paths.js
+++ b/scripts/get_clang_paths.js
@@ -7,27 +7,27 @@
     excludes: ['_generated'],
   },
   {
-    path: 'services/tunnelbroker/docker-server/contents/server/src',
+    path: 'services/tunnelbroker/src',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/backup/docker-server/contents/server/src',
+    path: 'services/tunnelbroker/test',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/backup/docker-server/contents/server/test',
+    path: 'services/backup/src',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/backup/docker-server/contents/server/dev',
+    path: 'services/backup/test',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/blob/docker-server/contents/server/src',
+    path: 'services/blob/src',
     extensions: ['cpp', 'h'],
   },
   {
-    path: 'services/blob/docker-server/contents/server/test',
+    path: 'services/blob/test',
     extensions: ['cpp', 'h'],
   },
   {
diff --git a/services/blob/src/Reactors/server/base-reactors/ServerBidiReactorBase.h b/services/blob/src/Reactors/server/base-reactors/ServerBidiReactorBase.h
--- a/services/blob/src/Reactors/server/base-reactors/ServerBidiReactorBase.h
+++ b/services/blob/src/Reactors/server/base-reactors/ServerBidiReactorBase.h
@@ -2,10 +2,10 @@
 
 #include <grpcpp/grpcpp.h>
 
+#include <atomic>
 #include <iostream>
 #include <memory>
 #include <string>
-#include <atomic>
 
 namespace comm {
 namespace network {
diff --git a/services/blob/src/Reactors/server/base-reactors/ServerReadReactorBase.h b/services/blob/src/Reactors/server/base-reactors/ServerReadReactorBase.h
--- a/services/blob/src/Reactors/server/base-reactors/ServerReadReactorBase.h
+++ b/services/blob/src/Reactors/server/base-reactors/ServerReadReactorBase.h
@@ -2,10 +2,10 @@
 
 #include <grpcpp/grpcpp.h>
 
+#include <atomic>
 #include <iostream>
 #include <memory>
 #include <string>
-#include <atomic>
 
 namespace comm {
 namespace network {
diff --git a/services/tunnelbroker/src/Constants.h b/services/tunnelbroker/src/Constants.h
--- a/services/tunnelbroker/src/Constants.h
+++ b/services/tunnelbroker/src/Constants.h
@@ -36,8 +36,7 @@
 const std::string AMQP_HEADER_TO_DEVICEID = "toDeviceID";
 const std::string AMQP_HEADER_MESSAGEID = "messageID";
 
-const int64_t AMQP_SHORTEST_RECONNECTION_ATTEMPT_INTERVAL =
-    1000 * 60; // 1 min
+const int64_t AMQP_SHORTEST_RECONNECTION_ATTEMPT_INTERVAL = 1000 * 60; // 1 min
 
 // DeviceID
 const size_t DEVICEID_CHAR_LENGTH = 64;
diff --git a/services/tunnelbroker/test/TunnelBrokerTest.cpp b/services/tunnelbroker/test/TunnelBrokerTest.cpp
--- a/services/tunnelbroker/test/TunnelBrokerTest.cpp
+++ b/services/tunnelbroker/test/TunnelBrokerTest.cpp
@@ -1,7 +1,6 @@
 #include <gtest/gtest.h>
 
-class TunnelBrokerTest : public testing::Test
-{
+class TunnelBrokerTest : public testing::Test {
 protected:
   virtual void SetUp() {
     //...