diff --git a/src/httpserver.cpp b/src/httpserver.cpp
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -102,9 +102,12 @@
             std::unique_ptr<WorkItem> i;
             {
                 WAIT_LOCK(cs, lock);
-                while (running && queue.empty())
+                while (running && queue.empty()) {
                     cond.wait(lock);
-                if (!running) break;
+                }
+                if (!running) {
+                    break;
+                }
                 i = std::move(queue.front());
                 queue.pop_front();
             }
@@ -147,9 +150,14 @@
 
 /** Check if a network address is allowed to access the HTTP server */
 static bool ClientAllowed(const CNetAddr &netaddr) {
-    if (!netaddr.IsValid()) return false;
-    for (const CSubNet &subnet : rpc_allow_subnets)
-        if (subnet.Match(netaddr)) return true;
+    if (!netaddr.IsValid()) {
+        return false;
+    }
+    for (const CSubNet &subnet : rpc_allow_subnets) {
+        if (subnet.Match(netaddr)) {
+            return true;
+        }
+    }
     return false;
 }
 
@@ -456,7 +464,9 @@
         // Reject requests on current connections
         evhttp_set_gencb(eventHTTP, http_reject_request_cb, nullptr);
     }
-    if (workQueue) workQueue->Interrupt();
+    if (workQueue) {
+        workQueue->Interrupt();
+    }
 }
 
 void StopHTTPServer() {
@@ -509,7 +519,9 @@
     // Static handler: simply call inner handler
     HTTPEvent *self = static_cast<HTTPEvent *>(data);
     self->handler();
-    if (self->deleteWhenTriggered) delete self;
+    if (self->deleteWhenTriggered) {
+        delete self;
+    }
 }
 
 HTTPEvent::HTTPEvent(struct event_base *base, bool _deleteWhenTriggered,
@@ -545,15 +557,18 @@
     const struct evkeyvalq *headers = evhttp_request_get_input_headers(req);
     assert(headers);
     const char *val = evhttp_find_header(headers, hdr.c_str());
-    if (val)
+    if (val) {
         return std::make_pair(true, val);
-    else
+    } else {
         return std::make_pair(false, "");
+    }
 }
 
 std::string HTTPRequest::ReadBody() {
     struct evbuffer *buf = evhttp_request_get_input_buffer(req);
-    if (!buf) return "";
+    if (!buf) {
+        return "";
+    }
     size_t size = evbuffer_get_length(buf);
     /**
      * Trivial implementation: if this is ever a performance bottleneck,
@@ -657,8 +672,11 @@
 void UnregisterHTTPHandler(const std::string &prefix, bool exactMatch) {
     std::vector<HTTPPathHandler>::iterator i = pathHandlers.begin();
     std::vector<HTTPPathHandler>::iterator iend = pathHandlers.end();
-    for (; i != iend; ++i)
-        if (i->prefix == prefix && i->exactMatch == exactMatch) break;
+    for (; i != iend; ++i) {
+        if (i->prefix == prefix && i->exactMatch == exactMatch) {
+            break;
+        }
+    }
     if (i != iend) {
         LogPrint(BCLog::HTTP,
                  "Unregistering HTTP handler for %s (exactmatch %d)\n", prefix,