NR review and tech feedback

Author: lindseymoore

source/crud/query/count.txt

@@ -242,58 +242,24 @@ Count Documents Example: Full File
 
 .. include:: /includes/usage-examples/example-intro.rst
 
-The following example performs the following on the ``restaurants``
-collection:
+This example performs the following on the ``restaurants`` collection:
 
 - Approximates the number of documents in the collection
-- Counts the number of documents in which the value of the ``cuisine`` is "American"
+- Counts the number of documents in which the value of the ``cuisine`` field is ``"American"``
 
-Select the :guilabel:`Struct` or :guilabel:`bson.D` tab to see the corresponding code:
-
-.. tabs::
-
-   .. tab :: Struct
-      :tabid: structExample
-
-      The following code uses structs to approximate the number of documents in
-      the collection and count the number of documents in which the value of the 
-      ``cuisine`` is "American":
-
-      .. io-code-block::
-         :copyable: true
-
-         .. input:: /includes/usage-examples/code-snippets/count.go
-            :language: go
-            :dedent:
-
-         .. output::
-            :language: none
-            :visible: false 
-
-            Estimated number of documents in the restaurants collection: 25359
-            Number of restaurants with American cuisine: 6183
-
-   .. tab :: bson.D
-      :tabid: bsonDExample
-
-      The following code uses a bson.D type to approximate the number of documents in
-      the collection and count the number of documents in which the value of the 
-      ``cuisine`` is "American":
-
-      .. io-code-block::
-         :copyable: true
-
-         .. input:: /includes/usage-examples/code-snippets/countBsonD.go
-            :language: go
-            :dedent:
+.. io-code-block::
+   :copyable: true
 
-         .. output::
-            :language: none
-            :visible: false 
+   .. input:: /includes/usage-examples/code-snippets/count.go
+      :language: go
+      :dedent:
 
-            Estimated number of documents in the restaurants collection: 25359
-            Number of restaurants with American cuisine: 6183
+   .. output::
+      :language: none
+      :visible: false 
 
+      Estimated number of documents in the restaurants collection: 25359
+      Number of restaurants with American cuisine: 6183
 
 Additional Information
 ----------------------

source/includes/usage-examples/code-snippets/count.go

@@ -23,11 +23,6 @@ type Restaurant struct {
 	Grades       interface{}
 }
 
-// Creates a filter struct to use for the query
-type RestaurantCuisineFilter struct {
-	Cuisine string
-}
-
 func main() {
 	if err := godotenv.Load(); err != nil {
 		log.Println("No .env file found")
@@ -50,18 +45,17 @@ func main() {
 
 	coll := client.Database("sample_restaurants").Collection("restaurants")
 
-	// Specifies a filter to match documents where the "cuisine"
+	// Specifies a filter to match documents where the "cuisine" field
 	// has a value of "American"
-	filter := RestaurantCuisineFilter{Cuisine: "American"}
+	filter := bson.D{{"cuisine", "American"}}
 
 	// Retrieves and prints the estimated number of documents in the collection
 	estCount, estCountErr := coll.EstimatedDocumentCount(context.TODO())
 	if estCountErr != nil {
 		panic(estCountErr)
 	}
 
-	// Retrieves and prints the number of documents in the collection
-	// that match the filter
+	// Retrieves and prints the number of matching documents in the collection
 	count, err := coll.CountDocuments(context.TODO(), filter)
 	if err != nil {
 		panic(err)