diff --git a/src/netbase.cpp b/src/netbase.cpp
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -38,9 +38,15 @@
 
 enum Network ParseNetwork(std::string net) {
     boost::to_lower(net);
-    if (net == "ipv4") return NET_IPV4;
-    if (net == "ipv6") return NET_IPV6;
-    if (net == "tor" || net == "onion") return NET_TOR;
+    if (net == "ipv4") {
+        return NET_IPV4;
+    }
+    if (net == "ipv6") {
+        return NET_IPV6;
+    }
+    if (net == "tor" || net == "onion") {
+        return NET_TOR;
+    }
     return NET_UNROUTABLE;
 }
 
@@ -82,7 +88,9 @@
 #endif
     struct addrinfo *aiRes = nullptr;
     int nErr = getaddrinfo(pszName, nullptr, &aiHint, &aiRes);
-    if (nErr) return false;
+    if (nErr) {
+        return false;
+    }
 
     struct addrinfo *aiTrav = aiRes;
     while (aiTrav != nullptr &&
@@ -132,14 +140,18 @@
 bool LookupHost(const char *pszName, CNetAddr &addr, bool fAllowLookup) {
     std::vector<CNetAddr> vIP;
     LookupHost(pszName, vIP, 1, fAllowLookup);
-    if (vIP.empty()) return false;
+    if (vIP.empty()) {
+        return false;
+    }
     addr = vIP.front();
     return true;
 }
 
 bool Lookup(const char *pszName, std::vector<CService> &vAddr, int portDefault,
             bool fAllowLookup, unsigned int nMaxSolutions) {
-    if (pszName[0] == 0) return false;
+    if (pszName[0] == 0) {
+        return false;
+    }
     int port = portDefault;
     std::string hostname = "";
     SplitHostPort(std::string(pszName), port, hostname);
@@ -147,10 +159,13 @@
     std::vector<CNetAddr> vIP;
     bool fRet =
         LookupIntern(hostname.c_str(), vIP, nMaxSolutions, fAllowLookup);
-    if (!fRet) return false;
+    if (!fRet) {
+        return false;
+    }
     vAddr.resize(vIP.size());
-    for (unsigned int i = 0; i < vIP.size(); i++)
+    for (unsigned int i = 0; i < vIP.size(); i++) {
         vAddr[i] = CService(vIP[i], port);
+    }
     return true;
 }
 
@@ -158,7 +173,9 @@
             bool fAllowLookup) {
     std::vector<CService> vService;
     bool fRet = Lookup(pszName, vService, portDefault, fAllowLookup, 1);
-    if (!fRet) return false;
+    if (!fRet) {
+        return false;
+    }
     addr = vService[0];
     return true;
 }
@@ -167,7 +184,9 @@
     CService addr;
     // "1.2:345" will fail to resolve the ip, but will still set the port.
     // If the ip fails to resolve, re-init the result.
-    if (!Lookup(pszName, addr, portDefault, false)) addr = CService();
+    if (!Lookup(pszName, addr, portDefault, false)) {
+        addr = CService();
+    }
     return addr;
 }
 
@@ -351,8 +370,9 @@
         std::vector<uint8_t> vAuth;
         // Current (and only) version of user/pass subnegotiation
         vAuth.push_back(0x01);
-        if (auth->username.size() > 255 || auth->password.size() > 255)
+        if (auth->username.size() > 255 || auth->password.size() > 255) {
             return error("Proxy username or password too long");
+        }
         vAuth.push_back(auth->username.size());
         vAuth.insert(vAuth.end(), auth->username.begin(), auth->username.end());
         vAuth.push_back(auth->password.size());
@@ -565,7 +585,9 @@
 
 bool SetProxy(enum Network net, const proxyType &addrProxy) {
     assert(net >= 0 && net < NET_MAX);
-    if (!addrProxy.IsValid()) return false;
+    if (!addrProxy.IsValid()) {
+        return false;
+    }
     LOCK(cs_proxyInfos);
     proxyInfo[net] = addrProxy;
     return true;
@@ -574,13 +596,17 @@
 bool GetProxy(enum Network net, proxyType &proxyInfoOut) {
     assert(net >= 0 && net < NET_MAX);
     LOCK(cs_proxyInfos);
-    if (!proxyInfo[net].IsValid()) return false;
+    if (!proxyInfo[net].IsValid()) {
+        return false;
+    }
     proxyInfoOut = proxyInfo[net];
     return true;
 }
 
 bool SetNameProxy(const proxyType &addrProxy) {
-    if (!addrProxy.IsValid()) return false;
+    if (!addrProxy.IsValid()) {
+        return false;
+    }
     LOCK(cs_proxyInfos);
     nameProxy = addrProxy;
     return true;
@@ -588,7 +614,9 @@
 
 bool GetNameProxy(proxyType &nameProxyOut) {
     LOCK(cs_proxyInfos);
-    if (!nameProxy.IsValid()) return false;
+    if (!nameProxy.IsValid()) {
+        return false;
+    }
     nameProxyOut = nameProxy;
     return true;
 }
@@ -613,7 +641,9 @@
                          bool *outProxyConnectionFailed) {
     // first connect to proxy server
     if (!ConnectSocketDirectly(proxy.proxy, hSocket, nTimeout)) {
-        if (outProxyConnectionFailed) *outProxyConnectionFailed = true;
+        if (outProxyConnectionFailed) {
+            *outProxyConnectionFailed = true;
+        }
         return false;
     }
     // do socks negotiation
@@ -689,14 +719,18 @@
     s = strerror_r(err, buf, sizeof(buf));
 #else
     /* POSIX variant always returns message in buffer */
-    if (strerror_r(err, buf, sizeof(buf))) buf[0] = 0;
+    if (strerror_r(err, buf, sizeof(buf))) {
+        buf[0] = 0;
+    }
 #endif
     return strprintf("%s (%d)", s, err);
 }
 #endif
 
 bool CloseSocket(SOCKET &hSocket) {
-    if (hSocket == INVALID_SOCKET) return false;
+    if (hSocket == INVALID_SOCKET) {
+        return false;
+    }
 #ifdef WIN32
     int ret = closesocket(hSocket);
 #else