diff --git a/include/grpcpp/impl/codegen/client_interceptor.h b/include/grpcpp/impl/codegen/client_interceptor.h
index 9e978b6a53e..03cb41fb58f 100644
--- a/include/grpcpp/impl/codegen/client_interceptor.h
+++ b/include/grpcpp/impl/codegen/client_interceptor.h
@@ -145,6 +145,8 @@ class ClientRpcInfo {
       // No interceptors to register
       return;
     }
+    // NOTE: The following is not a range-based for loop because it will only
+    //       iterate over a portion of the creators vector.
     for (auto it = creators.begin() + interceptor_pos; it != creators.end();
          ++it) {
       auto* interceptor = (*it)->CreateClientInterceptor(this);
diff --git a/include/grpcpp/impl/codegen/service_type.h b/include/grpcpp/impl/codegen/service_type.h
index f13dfb99fa0..1b249209977 100644
--- a/include/grpcpp/impl/codegen/service_type.h
+++ b/include/grpcpp/impl/codegen/service_type.h
@@ -63,8 +63,8 @@ class Service {
   virtual ~Service() {}
 
   bool has_async_methods() const {
-    for (auto it = methods_.begin(); it != methods_.end(); ++it) {
-      if (*it && (*it)->handler() == nullptr) {
+    for (const auto& method : methods_) {
+      if (method && method->handler() == nullptr) {
         return true;
       }
     }
@@ -72,9 +72,9 @@ class Service {
   }
 
   bool has_synchronous_methods() const {
-    for (auto it = methods_.begin(); it != methods_.end(); ++it) {
-      if (*it &&
-          (*it)->api_type() == internal::RpcServiceMethod::ApiType::SYNC) {
+    for (const auto& method : methods_) {
+      if (method &&
+          method->api_type() == internal::RpcServiceMethod::ApiType::SYNC) {
         return true;
       }
     }
@@ -82,11 +82,11 @@ class Service {
   }
 
   bool has_callback_methods() const {
-    for (auto it = methods_.begin(); it != methods_.end(); ++it) {
-      if (*it && ((*it)->api_type() ==
-                      internal::RpcServiceMethod::ApiType::CALL_BACK ||
-                  (*it)->api_type() ==
-                      internal::RpcServiceMethod::ApiType::RAW_CALL_BACK)) {
+    for (const auto& method : methods_) {
+      if (method && (method->api_type() ==
+                         internal::RpcServiceMethod::ApiType::CALL_BACK ||
+                     method->api_type() ==
+                         internal::RpcServiceMethod::ApiType::RAW_CALL_BACK)) {
         return true;
       }
     }
@@ -94,8 +94,8 @@ class Service {
   }
 
   bool has_generic_methods() const {
-    for (auto it = methods_.begin(); it != methods_.end(); ++it) {
-      if (it->get() == nullptr) {
+    for (const auto& method : methods_) {
+      if (method.get() == nullptr) {
         return true;
       }
     }
diff --git a/include/grpcpp/test/server_context_test_spouse.h b/include/grpcpp/test/server_context_test_spouse.h
index f5ca552ea57..75a41ef3acf 100644
--- a/include/grpcpp/test/server_context_test_spouse.h
+++ b/include/grpcpp/test/server_context_test_spouse.h
@@ -37,12 +37,11 @@ class ServerContextTestSpouse {
     client_metadata_storage_.insert(
         std::pair<grpc::string, grpc::string>(key, value));
     ctx_->client_metadata_.map()->clear();
-    for (auto iter = client_metadata_storage_.begin();
-         iter != client_metadata_storage_.end(); ++iter) {
+    for (const auto& item : client_metadata_storage_) {
       ctx_->client_metadata_.map()->insert(
           std::pair<grpc::string_ref, grpc::string_ref>(
-              iter->first.c_str(),
-              grpc::string_ref(iter->second.data(), iter->second.size())));
+              item.first.c_str(),
+              grpc::string_ref(item.second.data(), item.second.size())));
     }
   }