diff --git a/include/linkahead/authentication.h b/include/linkahead/authentication.h
index d4596ae54c994435ea66d5d7204ed6ee2632e48c..1f2ffa8623a4c201eba5289c76fbd4bfbd1cc716 100644
--- a/include/linkahead/authentication.h
+++ b/include/linkahead/authentication.h
@@ -51,8 +51,8 @@ using linkahead::utility::base64_encode;
 class Authenticator {
 public:
   virtual ~Authenticator() = default;
-  [[nodiscard]] virtual auto GetCallCredentials() const
-    -> std::shared_ptr<grpc::CallCredentials> = 0;
+  [[nodiscard]] virtual auto
+  GetCallCredentials() const -> std::shared_ptr<grpc::CallCredentials> = 0;
 };
 
 /**
diff --git a/include/linkahead/configuration.h b/include/linkahead/configuration.h
index a25727db4713fca91e3468d66244bebfb8da4c8d..90378d11af5af365138fda2b84257d1554315e09 100644
--- a/include/linkahead/configuration.h
+++ b/include/linkahead/configuration.h
@@ -58,8 +58,8 @@ private:
 public:
   ConnectionConfiguration(std::string host, int port);
   virtual ~ConnectionConfiguration() = default;
-  friend auto operator<<(std::ostream &out, const ConnectionConfiguration &configuration)
-    -> std::ostream &;
+  friend auto operator<<(std::ostream &out,
+                         const ConnectionConfiguration &configuration) -> std::ostream &;
 
   [[nodiscard]] auto virtual ToString() const -> std::string = 0;
   [[nodiscard]] auto GetHost() const -> std::string;
@@ -104,7 +104,6 @@ public:
 class ConfigurationManager {
 public:
   static ConfigurationManager &GetInstance();
-  ;
 
   /**
    * See mReset.
@@ -126,16 +125,16 @@ public:
   /**
    * See mGetConnectionConfiguration.
    */
-  inline static auto GetConnectionConfiguration(const std::string &name)
-    -> std::unique_ptr<ConnectionConfiguration> {
+  inline static auto
+  GetConnectionConfiguration(const std::string &name) -> std::unique_ptr<ConnectionConfiguration> {
     return GetInstance().mGetConnectionConfiguration(name);
   }
 
   /**
    * Return the ConnectionConfiguration for the default connection.
    */
-  inline static auto GetDefaultConnectionConfiguration()
-    -> std::unique_ptr<ConnectionConfiguration> {
+  inline static auto
+  GetDefaultConnectionConfiguration() -> std::unique_ptr<ConnectionConfiguration> {
     return GetInstance().mGetConnectionConfiguration(GetInstance().mGetDefaultConnectionName());
   }
 
@@ -157,7 +156,7 @@ private:
   static ConfigurationManager mInstance;
 
   inline ConfigurationManager()
-    : json_configuration(nullptr){
+    : json_configuration(nullptr) {
         // InitializeDefaults();
       };
 
diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index 97fdcd97f28d5a5e0ab3fa8347afcede425d153d..086821c76dd0c9f6aab4e4f2d3dfe8fe9e3ba82f 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -111,8 +111,8 @@ public:
    */
   // TODO(tf) find a way to deal with this:
   // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  [[nodiscard]] auto RetrieveSingleUser(const std::string &realm, const std::string &name) const
-    -> User;
+  [[nodiscard]] auto RetrieveSingleUser(const std::string &realm,
+                                        const std::string &name) const -> User;
 
   /**
    * Create a new user.
@@ -173,7 +173,7 @@ private:
 
   static ConnectionManager mInstance;
 
-  inline ConnectionManager(){};
+  inline ConnectionManager() {};
 
   auto mHasConnection(const std::string &name) const -> bool;
 
diff --git a/include/linkahead/info.h b/include/linkahead/info.h
index 237564a7a6f61f01dd2de073542a13465911a585..be613b25cd2c927c1fadeeb01a3f49f9e730aa2d 100644
--- a/include/linkahead/info.h
+++ b/include/linkahead/info.h
@@ -53,7 +53,7 @@ public:
    * LinkAheadConnection::GetVersionInfo() instead to get the version of the
    * server behind the given connection.
    */
-  explicit inline VersionInfo(ProtoVersionInfo *info) : info(info){};
+  explicit inline VersionInfo(ProtoVersionInfo *info) : info(info) {};
   [[nodiscard]] inline auto GetMajor() const -> int32_t { return this->info->major(); }
   [[nodiscard]] inline auto GetMinor() const -> int32_t { return this->info->minor(); }
   [[nodiscard]] inline auto GetPatch() const -> int32_t { return this->info->patch(); }
diff --git a/include/linkahead/logging.h b/include/linkahead/logging.h
index 3b70c1a203178e383d8ba286749427c8fb811158..3bafc9304162ebc094d725d0f0babe861751061b 100644
--- a/include/linkahead/logging.h
+++ b/include/linkahead/logging.h
@@ -88,7 +88,7 @@ private:
  */
 class LevelConfiguration {
 public:
-  LevelConfiguration(int level) : level(level){};
+  LevelConfiguration(int level) : level(level) {};
   [[nodiscard]] inline auto GetLevel() const -> int { return this->level; }
 
 private:
diff --git a/include/linkahead/transaction.h b/include/linkahead/transaction.h
index efe2ae0ff69b244ffb09245d1ff3b31a92e9b5bf..442d5366975b7798178210d78a518ac250f14232 100644
--- a/include/linkahead/transaction.h
+++ b/include/linkahead/transaction.h
@@ -228,8 +228,8 @@ public:
    * If the file cannot be downloaded due to unsufficient permissions an error
    * is appended.
    */
-  auto RetrieveAndDownloadFileById(const std::string &id, const std::string &local_path) noexcept
-    -> StatusCode;
+  auto RetrieveAndDownloadFileById(const std::string &id,
+                                   const std::string &local_path) noexcept -> StatusCode;
 
   /**
    * Add an entity id to this transaction for retrieval.
@@ -481,8 +481,8 @@ private:
 };
 
 template <class InputIterator>
-inline auto Transaction::RetrieveById(InputIterator begin, InputIterator end) noexcept
-  -> StatusCode {
+inline auto Transaction::RetrieveById(InputIterator begin,
+                                      InputIterator end) noexcept -> StatusCode {
   ASSERT_CAN_ADD_RETRIEVAL
 
   auto next = begin;
diff --git a/include/linkahead/transaction_status.h b/include/linkahead/transaction_status.h
index 4653b2a6d5ddc8b88b85b6de8e8641ca44b3a4ed..83d53ddaba584586fa82b79108c238dfc52c5555 100644
--- a/include/linkahead/transaction_status.h
+++ b/include/linkahead/transaction_status.h
@@ -194,8 +194,8 @@ public:
     TransactionStatus::ThrowExceptionIfError(this->code, this->description);
   }
 
-  inline static auto ThrowExceptionIfError(StatusCode code, const std::string &description)
-    -> void {
+  inline static auto ThrowExceptionIfError(StatusCode code,
+                                           const std::string &description) -> void {
     if (!IsError(code)) {
       return;
     }
@@ -243,7 +243,7 @@ public:
   inline auto GetCode() const -> StatusCode { return this->code; }
 
   TransactionStatus(StatusCode code, const std::string &description)
-    : code(code), description(description){};
+    : code(code), description(description) {};
 
 private:
   /**
diff --git a/include/linkahead/utility.h b/include/linkahead/utility.h
index 1b739d7e9f0a919df2501c6e8a0fb981407447be..faaabe67c28ce0407251f5518aca73f72fc591ca 100644
--- a/include/linkahead/utility.h
+++ b/include/linkahead/utility.h
@@ -88,8 +88,8 @@ inline auto get_env_fallback(const char *key, const char *fallback) -> const cha
  * @brief Return the value of an environment variable or - if undefined - the
  * fallback value.
  */
-inline auto get_env_fallback(const std::string &key, const std::string &fallback)
-  -> const std::string {
+inline auto get_env_fallback(const std::string &key,
+                             const std::string &fallback) -> const std::string {
   const char *val = get_env_fallback(key.c_str(), fallback.c_str());
 
   auto const result = std::string(val);
diff --git a/include/linkahead/value.h b/include/linkahead/value.h
index 78407a3f418a44e26d8f6ee50e751437e072bae2..d87f5043a22fd90c944d7125be1f32770d0c5821 100644
--- a/include/linkahead/value.h
+++ b/include/linkahead/value.h
@@ -170,7 +170,7 @@ public:
   /**
    * Destructor.
    */
-  inline ~ScalarValue(){};
+  inline ~ScalarValue() {};
   /**
    * Copy constructor.
    */
@@ -180,7 +180,7 @@ public:
   /**
    * Move constructor.
    */
-  inline ScalarValue(ScalarValue &&other) : ScalarValue(std::move(other.wrapped)){};
+  inline ScalarValue(ScalarValue &&other) : ScalarValue(std::move(other.wrapped)) {};
   /**
    * Copy assignment operator.
    */
diff --git a/src/linkahead/authentication.cpp b/src/linkahead/authentication.cpp
index 2d3cd96f2e4fa2360ebfe7c9b06dae82fb70e483..ec67c5efa5acc574bf52b6da1dfc9173096cbfd2 100644
--- a/src/linkahead/authentication.cpp
+++ b/src/linkahead/authentication.cpp
@@ -37,11 +37,10 @@ using linkahead::utility::base64_encode;
 MetadataCredentialsPluginImpl::MetadataCredentialsPluginImpl(std::string key, std::string value)
   : key(std::move(key)), value(std::move(value)) {}
 
-auto MetadataCredentialsPluginImpl::GetMetadata(string_ref /*service_url*/,
-                                                string_ref /*method_name*/,
-                                                const AuthContext & /*channel_auth_context*/,
-                                                std::multimap<grpc::string, grpc::string> *metadata)
-  -> Status {
+auto MetadataCredentialsPluginImpl::GetMetadata(
+  string_ref /*service_url*/, string_ref /*method_name*/,
+  const AuthContext & /*channel_auth_context*/,
+  std::multimap<grpc::string, grpc::string> *metadata) -> Status {
 
   metadata->insert(std::make_pair(this->key, this->value));
   return Status::OK;
diff --git a/src/linkahead/configuration.cpp b/src/linkahead/configuration.cpp
index 1c60cfe4c9154a8e2077bd9f08bfdd348483f647..d992006edb370fbdeaf8ff886a9a168e16706f0a 100644
--- a/src/linkahead/configuration.cpp
+++ b/src/linkahead/configuration.cpp
@@ -55,7 +55,7 @@
     throw ConfigurationError("This LinkAhead client has not been configured.");                    \
   }                                                                                                \
   assert(WRAPPED_JSON_CONFIGURATION(this)->is_object());                                           \
-  const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object();                     \
+  const auto &configuration = WRAPPED_JSON_CONFIGURATION(this)->as_object();                       \
   if (!configuration.contains("connections")) {                                                    \
     throw ConfigurationError("This LinkAhead client hasn't any configured connections.");          \
   }                                                                                                \
diff --git a/src/linkahead/connection.cpp b/src/linkahead/connection.cpp
index bff799b093741b81b90417446b3dc8ccf37916d4..717f7d96b5bffdb3e9b96d23d1ff731b920ad3b2 100644
--- a/src/linkahead/connection.cpp
+++ b/src/linkahead/connection.cpp
@@ -66,12 +66,9 @@ using linkahead::info::VersionInfo;
 using linkahead::transaction::Transaction;
 using linkahead::transaction::TransactionStatus;
 
-
 ConnectionManager ConnectionManager::mInstance;
 
-ConnectionManager &ConnectionManager::GetInstance() {
-  return mInstance;
-}
+ConnectionManager &ConnectionManager::GetInstance() { return mInstance; }
 
 Connection::Connection(const ConnectionConfiguration &configuration) {
   const std::string target =
diff --git a/src/linkahead/result_table_impl.h b/src/linkahead/result_table_impl.h
index 62d7fa1c67c4d9b9ec2d0ce2c6e6cb6856701040..9c68fc1c7d4da7b00773adb725d12787128d92a2 100644
--- a/src/linkahead/result_table_impl.h
+++ b/src/linkahead/result_table_impl.h
@@ -76,8 +76,8 @@ class ResultTableImpl : public ScalarProtoMessageWrapper<ProtoSelectQueryResult>
   friend class ResultTable;
   friend class ResultTable::HeaderIterator;
   friend class ResultTableColumn;
-  friend auto ProcessSelectResponse(ProtoSelectQueryResult *select_result)
-    -> std::unique_ptr<ResultTable>;
+  friend auto
+  ProcessSelectResponse(ProtoSelectQueryResult *select_result) -> std::unique_ptr<ResultTable>;
 };
 
 } // namespace linkahead::transaction
diff --git a/src/linkahead/transaction.cpp b/src/linkahead/transaction.cpp
index 2af4cadfef5a33cc33ae1648c19ffe73a6d99d7b..bf810084fe366a1de4ef3ff88c6bdbf024292577 100644
--- a/src/linkahead/transaction.cpp
+++ b/src/linkahead/transaction.cpp
@@ -79,9 +79,8 @@ auto Transaction::RetrieveById(const std::string &id) noexcept -> StatusCode {
   return this->status.GetCode();
 }
 
-auto Transaction::RetrieveAndDownloadFileById(const std::string &id,
-                                              const std::string &local_path) noexcept
-  -> StatusCode {
+auto Transaction::RetrieveAndDownloadFileById(
+  const std::string &id, const std::string &local_path) noexcept -> StatusCode {
   ASSERT_CAN_ADD_RETRIEVAL
 
   auto *retrieve_request = this->request->add_requests()->mutable_retrieve_request();
@@ -298,10 +297,9 @@ auto ProcessSelectResponse(ProtoSelectQueryResult *select_result) -> std::unique
   return ResultTableImpl::create(select_result);
 }
 
-auto Transaction::ProcessRetrieveResponse(RetrieveResponse *retrieve_response,
-                                          std::vector<std::unique_ptr<Entity>> *entities,
-                                          bool *set_error) const noexcept
-  -> std::unique_ptr<Entity> {
+auto Transaction::ProcessRetrieveResponse(
+  RetrieveResponse *retrieve_response, std::vector<std::unique_ptr<Entity>> *entities,
+  bool *set_error) const noexcept -> std::unique_ptr<Entity> {
   std::unique_ptr<Entity> result;
   switch (retrieve_response->retrieve_response_case()) {
   case RetrieveResponseCase::kEntityResponse: {
diff --git a/test/test_file_transmission.cpp b/test/test_file_transmission.cpp
index b337a2450f49460a89092b66ad8d2ed9e8ff97b8..27cac5615525c23ee9cf8bc112489157ce8e9c59 100644
--- a/test/test_file_transmission.cpp
+++ b/test/test_file_transmission.cpp
@@ -47,11 +47,11 @@ TEST_F(test_file_transmission, test_file_writer_reader) {
     FileWriter writer(test_file_name);
     std::string buffer_out(1024, 'c');
     for (int i = 0; i < 8; i++) {
-      writer.write(buffer_out);      
+      writer.write(buffer_out);
     }
   }
   EXPECT_EQ(fs::file_size(test_file_name), 1024 * 8);
-  
+
   {
     FileReader reader(test_file_name);
     std::string buffer_in(1024, '\0');