diff --git a/src/handles/command-base-handle.hpp b/src/handles/command-base-handle.hpp
index 520b7d0..584c6b6 100644
--- a/src/handles/command-base-handle.hpp
+++ b/src/handles/command-base-handle.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022, Regents of the University of California.
+ * Copyright (c) 2014-2023, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
  * See AUTHORS.md for complete list of repo-ng authors and contributors.
@@ -41,13 +41,6 @@
     using std::runtime_error::runtime_error;
   };
 
-public:
-  CommandBaseHandle(Face& face, RepoStorage& storageHandle,
-                    Scheduler& scheduler, ndn::security::Validator& validator);
-
-  virtual
-  ~CommandBaseHandle() = default;
-
   ndn::mgmt::Authorization
   makeAuthorization();
 
@@ -69,6 +62,12 @@
   }
 
 protected:
+  CommandBaseHandle(Face& face, RepoStorage& storageHandle,
+                    Scheduler& scheduler, ndn::security::Validator& validator);
+
+  ~CommandBaseHandle() = default;
+
+protected:
   Face& face;
   RepoStorage& storageHandle;
   Scheduler& scheduler;
diff --git a/src/handles/read-handle.hpp b/src/handles/read-handle.hpp
index 780a9c6..4e53f97 100644
--- a/src/handles/read-handle.hpp
+++ b/src/handles/read-handle.hpp
@@ -31,10 +31,10 @@
 
 class ReadHandle : public noncopyable
 {
-
 public:
   using DataPrefixRegistrationCallback = std::function<void(const ndn::Name&)>;
   using DataPrefixUnregistrationCallback = std::function<void(const ndn::Name&)>;
+
   struct RegisteredDataPrefix
   {
     ndn::RegisteredPrefixHandle hdl;