diff --git a/src/components/averages.tsx b/src/components/averages.tsx
index 64951c40..80b9ad18 100644
--- a/src/components/averages.tsx
+++ b/src/components/averages.tsx
@@ -13,16 +13,11 @@ const Averages = () => {
   const store = useAppSelector((state) => state);
   const resolverData = store.data;
 
-  // iterate through resolverData
-  // set count variable for resolvers of same type
-  // sum duration and find average for resolvers of same type
-  // save averages as object { resolverName: averageDuration }
-
   const tableData: JSX.Element[] = [];
   
-  let totalSum = 0;
-  let totalCount = 0;
-  let totalAverage;
+  let totalSum: number = 0;
+  let totalCount: number = 0;
+  let totalAverage: number | undefined;
 
   // if no resolver data set total average to 0
   totalCount === 0 ? totalAverage = 0 : totalAverage = totalSum / totalCount;
diff --git a/src/components/liveFeed.tsx b/src/components/liveFeed.tsx
index eed446c5..4e25d724 100644
--- a/src/components/liveFeed.tsx
+++ b/src/components/liveFeed.tsx
@@ -18,7 +18,6 @@ const LiveFeed = () => {
 
   const store = useAppSelector(state => state)
   const data = store.data.rawdata;
-  console.log('DATA FROM LIVE FEED: ', data);
 
   const items = data.map((obj: Object, i: Key) => {
     return (
diff --git a/src/components/metricsTable.tsx b/src/components/metricsTable.tsx
index 9839029a..8e7f9351 100644
--- a/src/components/metricsTable.tsx
+++ b/src/components/metricsTable.tsx
@@ -4,10 +4,10 @@ import { Flex } from '@chakra-ui/layout';
 const MetricsTable = ({ data }: any) => {
 
   const details: Array<any> = [];
-  let response;
-  let errors = '';
+  let response: string | undefined;
+  let errors: string = '';
 
-  for (let str of Object.keys(data)) {
+  for (let str of Object.keys(data)) { 
     if (str === 'trace_id') continue;
     if (str === 'errors') {
       errors += JSON.stringify(data[str]);
diff --git a/src/components/navitem.tsx b/src/components/navitem.tsx
index a46353cd..f77b1e38 100644
--- a/src/components/navitem.tsx
+++ b/src/components/navitem.tsx
@@ -1,4 +1,3 @@
-import React, { useEffect, useState } from 'react'
 import {
     Flex,
     Text,
diff --git a/src/components/resolverMetric.tsx b/src/components/resolverMetric.tsx
index cee10248..c04aa47f 100644
--- a/src/components/resolverMetric.tsx
+++ b/src/components/resolverMetric.tsx
@@ -23,10 +23,10 @@ const ResolverMetric = ({ data, id }: any) => {
     }
   }, [data])
 
-  const colors = ['orange.300', 'orange.400', 'orange.500', 'orange.600', 'orange.700'];
-  const errColors = ['red.500', 'red.600', 'red.700', 'red.800', 'red.900'];
+  const colors: string[] = ['orange.300', 'orange.400', 'orange.500', 'orange.600', 'orange.700'];
+  const errColors: string[] = ['red.500', 'red.600', 'red.700', 'red.800', 'red.900'];
   let index = 0;
-  const filteredData = Object.keys(data).filter(key => (
+  const filteredData: any[] = Object.keys(data).filter(key => (
     key !== 'dateAndTime' && key !== 'totalDuration' && key !== 'trace_id' && key !== 'errors' && key !== 'response'
   ));
 
diff --git a/src/state/action-creators/index.js b/src/state/action-creators/index.js
index 441e91ce..ee110570 100644
--- a/src/state/action-creators/index.js
+++ b/src/state/action-creators/index.js
@@ -1,8 +1,5 @@
 import * as types from '../constants/actionTypes'
 
-// create action creators and export them all individually
-// "export const [nameOfCreator]""
-
 export const updateDataActionCreator = newData => ({
   type: types.UPDATE_DATA,
   payload: newData
@@ -10,9 +7,4 @@ export const updateDataActionCreator = newData => ({
 
 export const deleteDataActionCreator = () => ({
   type: types.DELETE_DATA
-})
-
-// maybe add some actions for options 
-// actions can update how many resolvers to show for each graph
-
-// do we need action for darkmode? or chakra ui provides native method?
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/src/state/reducers/dataReducer.js b/src/state/reducers/dataReducer.js
index 07a3c8cc..8864a9f1 100644
--- a/src/state/reducers/dataReducer.js
+++ b/src/state/reducers/dataReducer.js
@@ -17,9 +17,10 @@ const dataReducer = (state = initialState, action) => {
       // UPDATE RAW DATA ARRAY
       clone.rawdata.push(data);
 
-      // UPDATE AVERAGES + COUNT
+      // UPDATE AVERAGES + COUNT 
+      const unrelatedKeys = ['dateAndTime', 'errors', 'response', 'totalDuration', 'trace_id'];
       for (let key in data) {
-        if (key !== 'dateAndTime' && key !== 'errors' && key !== 'response' && key !== 'totalDuration' && key !== 'trace_id') {
+        if (!unrelatedKeys.includes(key)) {
           if (clone.averages[key]) {
             let sum = clone.averages[key] * clone.count[key];
             sum += data[key];
diff --git a/tracer-npm-package/goTrace.js b/tracer-npm-package/goTrace.js
index 672e8668..bdfc3b42 100644
--- a/tracer-npm-package/goTrace.js
+++ b/tracer-npm-package/goTrace.js
@@ -40,7 +40,7 @@ module.exports = async function goTrace(schema, query, root, context, variables)
   if (errors.length === 0) {
     console.log(`Validation successful query can be executed`);  
   } else {
-    Object.keys(rootQueryObj).includes('errors') ? rootQueryObj['errors'].push(errors) : rootQueryObj['errors'] = [...errors];
+    rootQueryObj.hasOwnProperty('errors') ? rootQueryObj['errors'].push(errors) : rootQueryObj['errors'] = [...errors];
   }
 
   let endTime;
@@ -48,7 +48,7 @@ module.exports = async function goTrace(schema, query, root, context, variables)
 
   // Execute the query against the schema
   const currentDate = new Date(); 
-  const timestamp = currentDate. getTime()
+  const timestamp = currentDate.getTime()
   const dateAndTime = `${currentDate} | ${timestamp}`;
 
   rootQueryObj['dateAndTime'] = dateAndTime;
@@ -62,7 +62,7 @@ module.exports = async function goTrace(schema, query, root, context, variables)
     .then(() => { return rootQueryObj })
     .catch(err => {
       // rootQueryObj.hasOwnProperty('errors')
-      Object.keys(rootQueryObj).includes('errors') ? rootQueryObj['errors'].push(err.message) : rootQueryObj['errors'] = [...err.message];
+      rootQueryObj.hasOwnProperty('errors') ? rootQueryObj['errors'].push(err.message) : rootQueryObj['errors'] = [...err.message];
     });
 
   rootQueryObj.totalDuration = JSON.parse((endTime[1] / 1e6).toFixed(2));
diff --git a/tracer-npm-package/server.js b/tracer-npm-package/server.js
index a7e922fc..421994b0 100644
--- a/tracer-npm-package/server.js
+++ b/tracer-npm-package/server.js
@@ -9,7 +9,6 @@ app.use(express.static('out'))
 app.use(express.json())
 
 app.post('/socketio', (req, res) => {
-  console.log(req.body)
   req.app.io.emit('data', req.body)
   res.end()
 })