diff --git a/cpp/include/cugraph/sampling_functions.hpp b/cpp/include/cugraph/sampling_functions.hpp
index d50e5c0844..0763f9b115 100644
--- a/cpp/include/cugraph/sampling_functions.hpp
+++ b/cpp/include/cugraph/sampling_functions.hpp
@@ -282,7 +282,7 @@ struct sampling_flags_t {
  * edge_type and hop is the number of sampled edges while the size of the offsets vector is the
  * number of labels + 1.  src is the source vertex, dst is the destination vertex, weight
  * (optional) is the edge weight, edge_id (optional) identifies the edge id, edge_type (optional)
- * identifies the edge type, hop identifies which hop the edge was encountered in. 
+ * identifies the edge type, hop identifies which hop the edge was encountered in.
  * The offsets array (optional) identifies the offset for each label.
  *
  * If @p label_to_output_comm_rank is specified then the data will be shuffled so that all entries
@@ -356,7 +356,7 @@ homogeneous_uniform_neighbor_sample(
  * edge_type and hop is the number of sampled edges while the size of the offsets vector is the
  * number of labels + 1.  src is the source vertex, dst is the destination vertex, weight
  * (optional) is the edge weight, edge_id (optional) identifies the edge id, edge_type (optional)
- * identifies the edge type, hop identifies which hop the edge was encountered in. 
+ * identifies the edge type, hop identifies which hop the edge was encountered in.
  * The offsets array (optional) identifies the offset for each label.
  *
  * If @p label_to_output_comm_rank is specified then the data will be shuffled so that all entries
@@ -438,7 +438,7 @@ homogeneous_biased_neighbor_sample(
  * edge_type and hop is the number of sampled edges while the size of the offsets vector is the
  * number of labels + 1.  src is the source vertex, dst is the destination vertex, weight
  * (optional) is the edge weight, edge_id (optional) identifies the edge id, edge_type (optional)
- * identifies the edge type, hop identifies which hop the edge was encountered in. 
+ * identifies the edge type, hop identifies which hop the edge was encountered in.
  * The offsets array (optional) identifies the offset for each label.
  *
  * If @p label_to_output_comm_rank is specified then the data will be shuffled so that all entries
@@ -516,7 +516,7 @@ heterogeneous_uniform_neighbor_sample(
  * edge_type and hop is the number of sampled edges while the size of the offsets vector is the
  * number of labels + 1.  src is the source vertex, dst is the destination vertex, weight
  * (optional) is the edge weight, edge_id (optional) identifies the edge id, edge_type (optional)
- * identifies the edge type, hop identifies which hop the edge was encountered in. 
+ * identifies the edge type, hop identifies which hop the edge was encountered in.
  * The offsets array (optional) identifies the offset for each label.
  *
  * If @p label_to_output_comm_rank is specified then the data will be shuffled so that all entries
diff --git a/cpp/src/sampling/neighbor_sampling_impl.hpp b/cpp/src/sampling/neighbor_sampling_impl.hpp
index 54a1f6e728..ccca71cdf2 100644
--- a/cpp/src/sampling/neighbor_sampling_impl.hpp
+++ b/cpp/src/sampling/neighbor_sampling_impl.hpp
@@ -151,9 +151,7 @@ neighbor_sample_impl(raft::handle_t const& handle,
   level_result_dst_vectors.reserve(fan_out.size());
   if (level_result_weight_vectors) { (*level_result_weight_vectors).reserve(fan_out.size()); }
   if (level_result_edge_id_vectors) { (*level_result_edge_id_vectors).reserve(fan_out.size()); }
-  if (level_result_edge_type_vectors) {
-    (*level_result_edge_type_vectors).reserve(fan_out.size());
-  }
+  if (level_result_edge_type_vectors) { (*level_result_edge_type_vectors).reserve(fan_out.size()); }
   if (level_result_label_vectors) { (*level_result_label_vectors).reserve(fan_out.size()); }
 
   rmm::device_uvector<vertex_t> frontier_vertices(0, handle.get_stream());
@@ -228,9 +226,7 @@ neighbor_sample_impl(raft::handle_t const& handle,
       if (edge_types) { (*level_result_edge_type_vectors).push_back(std::move(*edge_types)); }
       if (labels) { (*level_result_label_vectors).push_back(std::move(*labels)); }
 
-      if (num_edge_types > 1) {
-        modified_graph_view.clear_edge_mask();
-      }
+      if (num_edge_types > 1) { modified_graph_view.clear_edge_mask(); }
     }
 
     // FIXME:  We should modify vertex_partition_range_lasts to return a raft::host_span
diff --git a/cpp/tests/sampling/mg_heterogeneous_biased_neighbor_sampling.cpp b/cpp/tests/sampling/mg_heterogeneous_biased_neighbor_sampling.cpp
index abdf882496..18d8491435 100644
--- a/cpp/tests/sampling/mg_heterogeneous_biased_neighbor_sampling.cpp
+++ b/cpp/tests/sampling/mg_heterogeneous_biased_neighbor_sampling.cpp
@@ -106,7 +106,6 @@ class Tests_MGHeterogeneous_Biased_Neighbor_Sampling
       mg_graph_view,
       std::optional<raft::device_span<vertex_t const>>{std::nullopt},
       rng_state,
-      // 20,
 
       std::max(static_cast<size_t>(mg_graph_view.number_of_vertices() * select_probability),
                std::min(static_cast<size_t>(mg_graph_view.number_of_vertices()), size_t{1})),
diff --git a/cpp/tests/sampling/mg_heterogeneous_uniform_neighbor_sampling.cpp b/cpp/tests/sampling/mg_heterogeneous_uniform_neighbor_sampling.cpp
index 42abf18682..b6812b3517 100644
--- a/cpp/tests/sampling/mg_heterogeneous_uniform_neighbor_sampling.cpp
+++ b/cpp/tests/sampling/mg_heterogeneous_uniform_neighbor_sampling.cpp
@@ -106,7 +106,6 @@ class Tests_MGHeterogeneous_Uniform_Neighbor_Sampling
       mg_graph_view,
       std::optional<raft::device_span<vertex_t const>>{std::nullopt},
       rng_state,
-      // 20,
 
       std::max(static_cast<size_t>(mg_graph_view.number_of_vertices() * select_probability),
                std::min(static_cast<size_t>(mg_graph_view.number_of_vertices()), size_t{1})),
diff --git a/cpp/tests/sampling/mg_homogeneous_biased_neighbor_sampling.cpp b/cpp/tests/sampling/mg_homogeneous_biased_neighbor_sampling.cpp
index 701816645f..ce153fd3f7 100644
--- a/cpp/tests/sampling/mg_homogeneous_biased_neighbor_sampling.cpp
+++ b/cpp/tests/sampling/mg_homogeneous_biased_neighbor_sampling.cpp
@@ -106,7 +106,6 @@ class Tests_MGHomogeneous_Biased_Neighbor_Sampling
       mg_graph_view,
       std::optional<raft::device_span<vertex_t const>>{std::nullopt},
       rng_state,
-      // 20,
 
       std::max(static_cast<size_t>(mg_graph_view.number_of_vertices() * select_probability),
                std::min(static_cast<size_t>(mg_graph_view.number_of_vertices()), size_t{1})),
diff --git a/cpp/tests/sampling/mg_homogeneous_uniform_neighbor_sampling.cpp b/cpp/tests/sampling/mg_homogeneous_uniform_neighbor_sampling.cpp
index 4d9d82fc71..88f2b8e28c 100644
--- a/cpp/tests/sampling/mg_homogeneous_uniform_neighbor_sampling.cpp
+++ b/cpp/tests/sampling/mg_homogeneous_uniform_neighbor_sampling.cpp
@@ -106,7 +106,6 @@ class Tests_MGHomogeneous_Uniform_Neighbor_Sampling
       mg_graph_view,
       std::optional<raft::device_span<vertex_t const>>{std::nullopt},
       rng_state,
-      // 20,
 
       std::max(static_cast<size_t>(mg_graph_view.number_of_vertices() * select_probability),
                std::min(static_cast<size_t>(mg_graph_view.number_of_vertices()), size_t{1})),