diff --git a/BUILD b/BUILD
index c098d9cb171de..bbae15b62a553 100644
--- a/BUILD
+++ b/BUILD
@@ -1473,7 +1473,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "handshaker",
     language = "c++",
-    public_hdrs =  GRPC_PUBLIC_HDRS + [
+    public_hdrs = GRPC_PUBLIC_HDRS + [
         "src/core/lib/transport/handshaker.h",
     ],
     deps = [
@@ -1512,19 +1512,19 @@ grpc_cc_library(
     srcs = [
         "src/core/lib/transport/http_connect_handshaker.cc",
     ],
+    external_deps = [
+        "absl/strings",
+    ],
     language = "c++",
     public_hdrs = [
         "src/core/lib/transport/http_connect_handshaker.h",
     ],
-    external_deps = [
-        "absl/strings",
-    ],
     deps = [
+        "channel_args",
+        "config",
         "gpr_base",
         "handshaker",
         "handshaker_registry",
-        "channel_args",
-        "config",
         "httpcli",
         "slice",
         "uri_parser",
@@ -2567,8 +2567,8 @@ grpc_cc_library(
         "grpc_service_config_impl",
         "grpc_trace",
         "handshaker_registry",
-        "httpcli",
         "http_connect_handshaker",
+        "httpcli",
         "json",
         "json_util",
         "orphanable",
diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.h b/src/core/lib/security/security_connector/fake/fake_security_connector.h
index d79147d87f24d..a2c6ec8a3bb83 100644
--- a/src/core/lib/security/security_connector/fake/fake_security_connector.h
+++ b/src/core/lib/security/security_connector/fake/fake_security_connector.h
@@ -27,7 +27,6 @@
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/transport/handshaker.h"
 
-
 /* Creates a fake connector that emulates real channel security.  */
 grpc_core::RefCountedPtr<grpc_channel_security_connector>
 grpc_fake_channel_security_connector_create(
diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc
index c91a32854d5cb..cdcb983d7e303 100644
--- a/src/core/lib/security/transport/security_handshaker.cc
+++ b/src/core/lib/security/transport/security_handshaker.cc
@@ -31,7 +31,6 @@
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channelz.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/src/core/lib/transport/http_connect_handshaker.cc b/src/core/lib/transport/http_connect_handshaker.cc
index a419dcd82c994..06e018bbcc8bb 100644
--- a/src/core/lib/transport/http_connect_handshaker.cc
+++ b/src/core/lib/transport/http_connect_handshaker.cc
@@ -36,9 +36,9 @@
 #include "src/core/lib/http/format_request.h"
 #include "src/core/lib/http/parser.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/uri/uri_parser.h"
 #include "src/core/lib/transport/handshaker.h"
 #include "src/core/lib/transport/handshaker_registry.h"
+#include "src/core/lib/uri/uri_parser.h"
 
 namespace grpc_core {
 
diff --git a/src/core/lib/transport/tcp_connect_handshaker.cc b/src/core/lib/transport/tcp_connect_handshaker.cc
index 4e448e72165f5..8dce8eb67e61f 100644
--- a/src/core/lib/transport/tcp_connect_handshaker.cc
+++ b/src/core/lib/transport/tcp_connect_handshaker.cc
@@ -25,8 +25,8 @@
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/iomgr/polling_entity.h"
+#include "src/core/lib/iomgr/tcp_client.h"
 #include "src/core/lib/transport/handshaker.h"
 #include "src/core/lib/transport/handshaker_registry.h"
 
@@ -102,7 +102,7 @@ void TCPConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
   args_ = args;
   char* address = grpc_channel_args_find_string(
       args->args, GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS);
-  absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(address);
+  absl::StatusOr<URI> uri = URI::Parse(address);
   if (!uri.ok() || !grpc_parse_uri(*uri, &addr_)) {
     MutexLock lock(&mu_);
     FinishLocked(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
diff --git a/src/core/lib/transport/tcp_connect_handshaker.h b/src/core/lib/transport/tcp_connect_handshaker.h
index 4782c83ddcb48..7f845606fa66b 100644
--- a/src/core/lib/transport/tcp_connect_handshaker.h
+++ b/src/core/lib/transport/tcp_connect_handshaker.h
@@ -25,7 +25,7 @@
 #define GRPC_ARG_TCP_HANDSHAKER_RESOLVED_ADDRESS \
   "grpc.internal.tcp_handshaker_resolved_address"
 
-// Whether the TCP connect handshaker should bind the endpoint to the pollset. 
+// Whether the TCP connect handshaker should bind the endpoint to the pollset.
 #define GRPC_ARG_TCP_HANDSHAKER_BIND_ENDPOINT_TO_POLLSET \
   "grpc.internal.tcp_handshaker_bind_endpoint_to_pollset"