diff --git a/include/grpc++/channel.h b/include/grpc++/channel.h
index 73f28a182c7..3849240574f 100644
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@@ -31,9 +31,7 @@ struct grpc_channel;
 
 namespace grpc {
 class ChannelConnectivityWatcher;
-}
 
-namespace grpc {
 /// Channels represent a connection to an endpoint. Created by \a CreateChannel.
 class Channel final : public ChannelInterface,
                       public CallHook,
diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc
index 38977cb4e7e..78f5de0d041 100644
--- a/src/cpp/client/channel_cc.cc
+++ b/src/cpp/client/channel_cc.cc
@@ -50,7 +50,7 @@ void WatchStateChange(void* arg);
 // support.
 class ChannelConnectivityWatcher {
  public:
-  ChannelConnectivityWatcher(Channel* channel)
+  explicit ChannelConnectivityWatcher(Channel* channel)
       : channel_(channel), thd_id_(0), being_destroyed_(0) {}
 
   void WatchStateChangeImpl() {
@@ -67,6 +67,7 @@ class ChannelConnectivityWatcher {
       state = channel_->GetState(false);
     }
   }
+
   void StartWatching() {
     gpr_thd_options options = gpr_thd_options_default();
     gpr_thd_options_set_joinable(&options);