diff --git a/src/utils/controllerHelpers.js b/src/utils/controllerHelpers.js
index 3ff005e..08da3ab 100644
--- a/src/utils/controllerHelpers.js
+++ b/src/utils/controllerHelpers.js
@@ -139,10 +139,7 @@ const executeQuery = async (req, res, collection, queryBuilder, dataProcessor =
     const query = await queryBuilder(params);
     const snapshot = await query.get();
 
-    let data = [];
-    snapshot.forEach(doc => {
-      data.push(doc.data());
-    });
+    let data = snapshot.docs.map(doc => doc.data());
 
     // Process data if processor provided
     if (dataProcessor) {
diff --git a/src/utils/reportService.js b/src/utils/reportService.js
index d7960a8..74e5251 100644
--- a/src/utils/reportService.js
+++ b/src/utils/reportService.js
@@ -60,8 +60,7 @@ export const queryTechnologies = async (params = {}) => {
   }
 
   const snapshot = await query.get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
+  const data = snapshot.docs.map(doc => doc.data());
 
   if (isOnlyNames) {
     return data.map(item => item.technology);
@@ -102,8 +101,7 @@ export const queryCategories = async (params = {}) => {
   }
 
   const snapshot = await query.get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
+  const data = snapshot.docs.map(doc => doc.data());
 
   if (isOnlyNames) {
     return data.map(item => item.category);
@@ -149,10 +147,7 @@ export const queryReport = async (reportType, params = {}) => {
   }
 
   const snapshot = await query.get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
-
-  return data;
+  return snapshot.docs.map(doc => doc.data());
 };
 
 export const queryCWVDistribution = async ({ technology, date, geo = 'ALL', rank = null }) => {
@@ -275,9 +270,7 @@ export const queryRanks = async () => {
     .orderBy('mobile_origins', 'desc')
     .select('rank')
     .get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
-  return data;
+  return snapshot.docs.map(doc => doc.data());
 };
 
 export const queryGeos = async () => {
@@ -286,9 +279,7 @@ export const queryGeos = async () => {
     .orderBy('mobile_origins', 'desc')
     .select('geo')
     .get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
-  return data;
+  return snapshot.docs.map(doc => doc.data());
 };
 
 export const queryVersions = async (params = {}) => {
@@ -317,7 +308,5 @@ export const queryVersions = async (params = {}) => {
   }
 
   const snapshot = await query.get();
-  const data = [];
-  snapshot.forEach(doc => data.push(doc.data()));
-  return data;
+  return snapshot.docs.map(doc => doc.data());
 };