diff --git a/src/coins.h b/src/coins.h
index 2ac1bcf7fa..3180961bd7 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -322,8 +322,8 @@ public:
      * Note that lightweight clients may not know anything besides the hash of previous transactions,
      * so may not be able to calculate this.
      *
-     * @param[in] tx	transaction for which we are checking input total
-     * @return	Sum of value of all inputs (scriptSigs)
+     * @param[in] tx    transaction for which we are checking input total
+     * @return  Sum of value of all inputs (scriptSigs)
      */
     CAmount GetValueIn(const CTransaction& tx) const;
 
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index ec93bde51f..f7195aff78 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -2570,6 +2570,7 @@ static UniValue getblockfilter(const JSONRPCRequest& request)
     return ret;
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -2611,6 +2612,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "waitforblockheight",     &waitforblockheight,     {"height","timeout"} },
     { "hidden",             "syncwithvalidationinterfacequeue", &syncwithvalidationinterfacequeue, {} },
 };
+// clang-format on
 
 void RegisterBlockchainRPCCommands(CRPCTable &t)
 {
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 0bb8ea01d2..ac6272d5fe 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -19,6 +19,7 @@ public:
     std::string paramName;  //!< parameter name
 };
 
+// clang-format off
 /**
  * Specify a (method, idx, name) here if the argument is a non-string RPC
  * argument and needs to be converted from JSON.
@@ -192,6 +193,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "getnodeaddresses", 0, "count"},
     { "stop", 0, "wait" },
 };
+// clang-format on
 
 class CRPCConvertTable
 {
diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp
index 4eed603763..7b0094f8d4 100644
--- a/src/rpc/coinjoin.cpp
+++ b/src/rpc/coinjoin.cpp
@@ -160,7 +160,7 @@ static UniValue getcoinjoininfo(const JSONRPCRequest& request)
 
     return obj;
 }
-
+// clang-format off
 static const CRPCCommand commands[] =
     { //  category              name                      actor (function)         argNames
         //  --------------------- ------------------------  ---------------------------------
@@ -170,7 +170,7 @@ static const CRPCCommand commands[] =
         { "dash",               "coinjoin",               &coinjoin,               {} },
 #endif // ENABLE_WALLET
 };
-
+// clang-format on
 void RegisterCoinJoinRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index e40dc3dbd8..5161662f37 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -1162,7 +1162,7 @@ static UniValue getsuperblockbudget(const JSONRPCRequest& request)
 
     return ValueFromAmount(CSuperblock::GetPaymentsLimit(nBlockHeight));
 }
-
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -1173,7 +1173,7 @@ static const CRPCCommand commands[] =
     { "dash",               "voteraw",                &voteraw,                {"tx_hash","tx_index","gov_hash","signal","outcome","time","sig"} },
 
 };
-
+// clang-format on
 void RegisterGovernanceRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 1e69620631..a410b92185 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -694,14 +694,14 @@ static UniValue masternodelist(const JSONRPCRequest& request)
 
     return obj;
 }
-
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
     { "dash",               "masternode",             &masternode,             {} },
     { "dash",               "masternodelist",         &masternodelist,         {} },
 };
-
+// clang-format on
 void RegisterMasternodeRPCCommands(CRPCTable &t)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 376ae7c10a..67282c3d13 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -971,6 +971,7 @@ static UniValue estimaterawfee(const JSONRPCRequest& request)
     return result;
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -991,6 +992,7 @@ static const CRPCCommand commands[] =
 
     { "hidden",             "estimaterawfee",         &estimaterawfee,         {"conf_target", "threshold"} },
 };
+// clang-format on
 
 void RegisterMiningRPCCommands(CRPCTable &t)
 {
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 08ca25ea91..3e2411ff64 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -1110,6 +1110,7 @@ static UniValue echo(const JSONRPCRequest& request)
     return request.params;
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -1139,6 +1140,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "echojson",               &echo,                   {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
     { "hidden",             "mnauth",                 &mnauth,                 {"nodeId", "proTxHash", "publicKey"}},
 };
+// clang-format on
 
 void RegisterMiscRPCCommands(CRPCTable &t)
 {
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index b2e302aec5..0909a81df9 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -756,6 +756,7 @@ static UniValue getnodeaddresses(const JSONRPCRequest& request)
     return ret;
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)         argNames
   //  --------------------- ------------------------  -----------------------  ----------
@@ -773,6 +774,7 @@ static const CRPCCommand commands[] =
     { "network",            "setnetworkactive",       &setnetworkactive,       {"state"} },
     { "network",            "getnodeaddresses",       &getnodeaddresses,       {"count"} },
 };
+// clang-format on
 
 void RegisterNetRPCCommands(CRPCTable &t)
 {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 8e654b5061..fd5957f2d5 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -1641,6 +1641,7 @@ UniValue converttopsbt(const JSONRPCRequest& request)
     return EncodeBase64(ssTx.str());
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                            actor (function)            argNames
   //  --------------------- ------------------------        -----------------------     ----------
@@ -1662,6 +1663,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "gettxoutproof",                &gettxoutproof,             {"txids", "blockhash"} },
     { "blockchain",         "verifytxoutproof",             &verifytxoutproof,          {"proof"} },
 };
+// clang-format on
 
 void RegisterRawTransactionRPCCommands(CRPCTable &t)
 {
diff --git a/src/rpc/rpcevo.cpp b/src/rpc/rpcevo.cpp
index f5724142be..78ae76e7df 100644
--- a/src/rpc/rpcevo.cpp
+++ b/src/rpc/rpcevo.cpp
@@ -1287,14 +1287,14 @@ static UniValue _bls(const JSONRPCRequest& request)
         bls_help();
     }
 }
-
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)
   //  --------------------- ------------------------  -----------------------
     { "evo",                "bls",                    &_bls,                   {}  },
     { "evo",                "protx",                  &protx,                  {}  },
 };
-
+// clang-format on
 void RegisterEvoRPCCommands(CRPCTable &tableRPC)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) {
diff --git a/src/rpc/rpcquorums.cpp b/src/rpc/rpcquorums.cpp
index 77ca9be93a..d008f33549 100644
--- a/src/rpc/rpcquorums.cpp
+++ b/src/rpc/rpcquorums.cpp
@@ -753,7 +753,7 @@ static UniValue verifyislock(const JSONRPCRequest& request)
     return llmq::quorumSigningManager->VerifyRecoveredSig(llmqType, signHeight, id, txid, sig, 0) ||
            llmq::quorumSigningManager->VerifyRecoveredSig(llmqType, signHeight, id, txid, sig, signOffset);
 }
-
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                      actor (function)
   //  --------------------- ------------------------  -----------------------
@@ -761,7 +761,7 @@ static const CRPCCommand commands[] =
     { "evo",                "verifychainlock",        &verifychainlock,        {"blockHash", "signature", "blockHeight"} },
     { "evo",                "verifyislock",           &verifyislock,           {"id", "txid", "signature", "maxHeight"}  },
 };
-
+// clang-format on
 void RegisterQuorumsRPCCommands(CRPCTable &tableRPC)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
index 1be07ef686..5194884608 100644
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -330,6 +330,7 @@ static UniValue uptime(const JSONRPCRequest& jsonRequest)
     return GetTime() - GetStartupTime();
 }
 
+// clang-format off
 /**
  * Call Table
  */
@@ -341,6 +342,7 @@ static const CRPCCommand vRPCCommands[] =
     { "control",            "stop",                   &stop,                   {"wait"}  },
     { "control",            "uptime",                 &uptime,                 {}  },
 };
+// clang-format on
 
 CRPCTable::CRPCTable()
 {
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index e8a6f7fcee..77b440b77a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4102,6 +4102,7 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
     return result;
 }
 
+// clang-format off
 static const CRPCCommand commands[] =
 { //  category              name                        actor (function)           argNames
     //  --------------------- ------------------------    -----------------------    ----------
@@ -4172,6 +4173,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "walletprocesspsbt",                &walletprocesspsbt,             {"psbt","sign","sighashtype","bip32derivs"} },
     { "wallet",             "walletcreatefundedpsbt",           &walletcreatefundedpsbt,        {"inputs","outputs","locktime","options","bip32derivs"} },
 };
+// clang-format on
 
 void RegisterWalletRPCCommands(CRPCTable &t)
 {