diff --git a/src/rest.cpp b/src/rest.cpp
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -27,21 +27,21 @@
 // Allow a max of 15 outpoints to be queried at once.
 static const size_t MAX_GETUTXOS_OUTPOINTS = 15;
 
-enum RetFormat {
-    RF_UNDEF,
-    RF_BINARY,
-    RF_HEX,
-    RF_JSON,
+enum class RetFormat {
+    UNDEF,
+    BINARY,
+    HEX,
+    JSON,
 };
 
 static const struct {
     enum RetFormat rf;
     const char *name;
 } rf_names[] = {
-    {RF_UNDEF, ""},
-    {RF_BINARY, "bin"},
-    {RF_HEX, "hex"},
-    {RF_JSON, "json"},
+    {RetFormat::UNDEF, ""},
+    {RetFormat::BINARY, "bin"},
+    {RetFormat::HEX, "hex"},
+    {RetFormat::JSON, "json"},
 };
 
 struct CCoin {
@@ -182,21 +182,21 @@
     }
 
     switch (rf) {
-        case RF_BINARY: {
+        case RetFormat::BINARY: {
             std::string binaryHeader = ssHeader.str();
             req->WriteHeader("Content-Type", "application/octet-stream");
             req->WriteReply(HTTP_OK, binaryHeader);
             return true;
         }
 
-        case RF_HEX: {
+        case RetFormat::HEX: {
             std::string strHex =
                 HexStr(ssHeader.begin(), ssHeader.end()) + "\n";
             req->WriteHeader("Content-Type", "text/plain");
             req->WriteReply(HTTP_OK, strHex);
             return true;
         }
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue jsonHeaders(UniValue::VARR);
             {
                 LOCK(cs_main);
@@ -259,21 +259,21 @@
     ssBlock << block;
 
     switch (rf) {
-        case RF_BINARY: {
+        case RetFormat::BINARY: {
             std::string binaryBlock = ssBlock.str();
             req->WriteHeader("Content-Type", "application/octet-stream");
             req->WriteReply(HTTP_OK, binaryBlock);
             return true;
         }
 
-        case RF_HEX: {
+        case RetFormat::HEX: {
             std::string strHex = HexStr(ssBlock.begin(), ssBlock.end()) + "\n";
             req->WriteHeader("Content-Type", "text/plain");
             req->WriteReply(HTTP_OK, strHex);
             return true;
         }
 
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue objBlock;
             {
                 LOCK(cs_main);
@@ -318,7 +318,7 @@
     const RetFormat rf = ParseDataFormat(param, strURIPart);
 
     switch (rf) {
-        case RF_JSON: {
+        case RetFormat::JSON: {
             JSONRPCRequest jsonRequest;
             jsonRequest.params = UniValue(UniValue::VARR);
             UniValue chainInfoObject = getblockchaininfo(config, jsonRequest);
@@ -348,7 +348,7 @@
     const RetFormat rf = ParseDataFormat(param, strURIPart);
 
     switch (rf) {
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue mempoolInfoObject = mempoolInfoToJSON();
 
             std::string strJSON = mempoolInfoObject.write() + "\n";
@@ -377,7 +377,7 @@
     const RetFormat rf = ParseDataFormat(param, strURIPart);
 
     switch (rf) {
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue mempoolObject = mempoolToJSON(true);
 
             std::string strJSON = mempoolObject.write() + "\n";
@@ -422,21 +422,21 @@
     ssTx << tx;
 
     switch (rf) {
-        case RF_BINARY: {
+        case RetFormat::BINARY: {
             std::string binaryTx = ssTx.str();
             req->WriteHeader("Content-Type", "application/octet-stream");
             req->WriteReply(HTTP_OK, binaryTx);
             return true;
         }
 
-        case RF_HEX: {
+        case RetFormat::HEX: {
             std::string strHex = HexStr(ssTx.begin(), ssTx.end()) + "\n";
             req->WriteHeader("Content-Type", "text/plain");
             req->WriteReply(HTTP_OK, strHex);
             return true;
         }
 
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue objTx(UniValue::VOBJ);
             TxToUniv(*tx, hashBlock, objTx);
             std::string strJSON = objTx.write() + "\n";
@@ -516,13 +516,13 @@
     }
 
     switch (rf) {
-        case RF_HEX: {
+        case RetFormat::HEX: {
             // convert hex to bin, continue then with bin part
             std::vector<uint8_t> strRequestV = ParseHex(strRequestMutable);
             strRequestMutable.assign(strRequestV.begin(), strRequestV.end());
         }
         // FALLTHROUGH
-        case RF_BINARY: {
+        case RetFormat::BINARY: {
             try {
                 // deserialize only if user sent a request
                 if (strRequestMutable.size() > 0) {
@@ -545,7 +545,7 @@
             break;
         }
 
-        case RF_JSON: {
+        case RetFormat::JSON: {
             if (!fInputParsed) {
                 return RESTERR(req, HTTP_BAD_REQUEST, "Error: empty request");
             }
@@ -606,7 +606,7 @@
     }
 
     switch (rf) {
-        case RF_BINARY: {
+        case RetFormat::BINARY: {
             // serialize data
             // use exact same output as mentioned in Bip64
             CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
@@ -620,7 +620,7 @@
             return true;
         }
 
-        case RF_HEX: {
+        case RetFormat::HEX: {
             CDataStream ssGetUTXOResponse(SER_NETWORK, PROTOCOL_VERSION);
             ssGetUTXOResponse << chainActive.Height()
                               << chainActive.Tip()->GetBlockHash() << bitmap
@@ -634,7 +634,7 @@
             return true;
         }
 
-        case RF_JSON: {
+        case RetFormat::JSON: {
             UniValue objGetUTXOResponse(UniValue::VOBJ);
 
             // pack in some essentials