diff --git a/llarp/dht/context.cpp b/llarp/dht/context.cpp
index 83510e370..6565f6f38 100644
--- a/llarp/dht/context.cpp
+++ b/llarp/dht/context.cpp
@@ -340,11 +340,13 @@ namespace llarp
     void
     Context::handle_explore_timer(uint64_t interval)
     {
-      const auto num =
-          std::min(router->NumberOfConnectedRouters(), size_t(4));
+      const auto num = std::min(router->NumberOfConnectedRouters(), size_t(4));
       if(num)
         Explore(num);
-      router->logic()->call_later(interval, std::bind(&llarp::dht::Context::handle_explore_timer, this, interval));
+      router->logic()->call_later(
+          interval,
+          std::bind(&llarp::dht::Context::handle_explore_timer, this,
+                    interval));
     }
 
     void
@@ -519,8 +521,10 @@ namespace llarp
       llarp::LogDebug("initialize dht with key ", ourKey);
       // start exploring
 
-      r->logic()->call_later(exploreInterval,
-          std::bind(&llarp::dht::Context::handle_explore_timer, this, exploreInterval));
+      r->logic()->call_later(
+          exploreInterval,
+          std::bind(&llarp::dht::Context::handle_explore_timer, this,
+                    exploreInterval));
       // start cleanup timer
       ScheduleCleanupTimer();
     }
@@ -528,7 +532,9 @@ namespace llarp
     void
     Context::ScheduleCleanupTimer()
     {
-      router->logic()->call_later(1000, std::bind(&llarp::dht::Context::handle_cleaner_timer, this, 1000));
+      router->logic()->call_later(
+          1000,
+          std::bind(&llarp::dht::Context::handle_cleaner_timer, this, 1000));
     }
 
     void
diff --git a/llarp/ev/ev.hpp b/llarp/ev/ev.hpp
index e404e3143..b10400ebd 100644
--- a/llarp/ev/ev.hpp
+++ b/llarp/ev/ev.hpp
@@ -669,7 +669,8 @@ namespace llarp
 #ifdef _WIN32
 struct llarp_fd_promise
 {
-  void Set(std::pair< int, int >)
+  void
+  Set(std::pair< int, int >)
   {
   }
 
diff --git a/llarp/ev/ev_libuv.cpp b/llarp/ev/ev_libuv.cpp
index 4d6d58746..d8c86048b 100644
--- a/llarp/ev/ev_libuv.cpp
+++ b/llarp/ev/ev_libuv.cpp
@@ -802,7 +802,11 @@ namespace libuv
     loop->process_cancel_queue();
   }
 
-  Loop::Loop() : llarp_ev_loop(), m_LogicCalls(1024), m_timerQueue(20), m_timerCancelQueue(20)
+  Loop::Loop()
+      : llarp_ev_loop()
+      , m_LogicCalls(1024)
+      , m_timerQueue(20)
+      , m_timerCancelQueue(20)
   {
   }
 
diff --git a/llarp/link/server.cpp b/llarp/link/server.cpp
index 1957c4ac3..78be94873 100644
--- a/llarp/link/server.cpp
+++ b/llarp/link/server.cpp
@@ -462,8 +462,8 @@ namespace llarp
   void
   ILinkLayer::ScheduleTick(uint64_t interval)
   {
-    tick_id = m_Logic->call_later(interval,
-                                  std::bind(&ILinkLayer::OnTick, this));
+    tick_id =
+        m_Logic->call_later(interval, std::bind(&ILinkLayer::OnTick, this));
   }
 
   void
diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp
index d133aaae1..bb9aea039 100644
--- a/llarp/link/server.hpp
+++ b/llarp/link/server.hpp
@@ -207,7 +207,6 @@ namespace llarp
     }
 
    private:
-
     void
     OnTick();
 
diff --git a/llarp/path/pathset.hpp b/llarp/path/pathset.hpp
index 0fd613f94..764796426 100644
--- a/llarp/path/pathset.hpp
+++ b/llarp/path/pathset.hpp
@@ -199,15 +199,15 @@ namespace llarp
       }
 
       /// override me in subtype
-      virtual bool HandleGotIntroMessage(
-          std::shared_ptr< const dht::GotIntroMessage >)
+      virtual bool
+      HandleGotIntroMessage(std::shared_ptr< const dht::GotIntroMessage >)
       {
         return false;
       }
 
       /// override me in subtype
-      virtual bool HandleGotRouterMessage(
-          std::shared_ptr< const dht::GotRouterMessage >)
+      virtual bool
+      HandleGotRouterMessage(std::shared_ptr< const dht::GotRouterMessage >)
       {
         return false;
       }
diff --git a/llarp/service/info.cpp b/llarp/service/info.cpp
index 4bf49a669..419201839 100644
--- a/llarp/service/info.cpp
+++ b/llarp/service/info.cpp
@@ -65,8 +65,7 @@ namespace llarp
       return m_CachedAddr.ToString();
     }
 
-    bool
-    ServiceInfo::CalculateAddress(std::array< byte_t, 32 >& data) const
+    bool ServiceInfo::CalculateAddress(std::array< byte_t, 32 >& data) const
     {
       std::array< byte_t, 256 > tmp;
       llarp_buffer_t buf(tmp);
diff --git a/llarp/service/info.hpp b/llarp/service/info.hpp
index b317c1d2a..ed1d6b659 100644
--- a/llarp/service/info.hpp
+++ b/llarp/service/info.hpp
@@ -97,8 +97,7 @@ namespace llarp
       }
 
       /// calculate our address
-      bool
-      CalculateAddress(std::array< byte_t, 32 >& data) const;
+      bool CalculateAddress(std::array< byte_t, 32 >& data) const;
 
       bool
       BDecode(llarp_buffer_t* buf)
diff --git a/llarp/util/aligned.hpp b/llarp/util/aligned.hpp
index c74fb11e9..db0e2130a 100644
--- a/llarp/util/aligned.hpp
+++ b/llarp/util/aligned.hpp
@@ -36,7 +36,9 @@ namespace llarp
   struct alignas(std::max_align_t) AlignedBuffer
 #endif
   {
-    static_assert(sz >= 8, "AlignedBuffer cannot be used with buffers smaller than 8 bytes");
+    static_assert(sz >= 8,
+                  "AlignedBuffer cannot be used with buffers smaller than 8 "
+                  "bytes");
 
     static constexpr size_t SIZE = sz;