diff --git a/client/src/components/allocations-assignment/allocations-assignment.container.jsx b/client/src/components/allocations-assignment/allocations-assignment.container.jsx
index 4cfd62fe3..434f71ecb 100644
--- a/client/src/components/allocations-assignment/allocations-assignment.container.jsx
+++ b/client/src/components/allocations-assignment/allocations-assignment.container.jsx
@@ -24,7 +24,7 @@ export default function AllocationsAssignmentContainer({
       notification["success"]({
         message: t("employees.successes.save")
       });
-      //TODO: Better way to reset the field decorators?
+      //TODO Better way to reset the field decorators?
       visibilityState[1](false);
       if (refetch) refetch();
     });
diff --git a/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx b/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx
index 9eb24798a..1c8323b4f 100644
--- a/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx
+++ b/client/src/components/jobs-detail-claims/jobs-detail-claims.component.jsx
@@ -20,7 +20,7 @@ export default function JobsDetailClaims({ job }) {
           initialValue: job.loss_desc
         })(<Input name='loss_desc' />)}
       </Form.Item>
-      TODO: How to handle different taxes and marking them as exempt?
+      TODO How to handle different taxes and marking them as exempt?
       {
         // <Form.Item label={t("jobs.fields.exempt")}>
         //     {getFieldDecorator("exempt", {
diff --git a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
index 37a2bae9a..0bd919542 100644
--- a/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
+++ b/client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
@@ -25,13 +25,13 @@ export default function JobsDetailFinancials({ job }) {
           initialValue: job.depreciation_taxes
         })(<InputNumber name="depreciation_taxes" />)}
       </Form.Item>
-      TODO: This is equivalent of GST payable.
+      TODO This is equivalent of GST payable.
       <Form.Item label={t("jobs.fields.federal_tax_payable")}>
         {getFieldDecorator("federal_tax_payable", {
           initialValue: job.federal_tax_payable
         })(<InputNumber name="federal_tax_payable" />)}
       </Form.Item>
-      TODO: equivalent of other customer amount
+      TODO equivalent of other customer amount
       <Form.Item label={t("jobs.fields.other_amount_payable")}>
         {getFieldDecorator("other_amount_payable", {
           initialValue: job.other_amount_payable
@@ -99,7 +99,7 @@ export default function JobsDetailFinancials({ job }) {
           initialValue: job.rate_lag
         })(<InputNumber name="rate_lag" />)}
       </Form.Item>
-      Note //TODO: Remove ATP rate?
+      Note //TODO Remove ATP rate?
       <Form.Item label={t("jobs.fields.rate_atp")}>
         {getFieldDecorator("rate_atp", {
           initialValue: job.rate_atp
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 2c2ca281d..70417434b 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -69,7 +69,7 @@ export default connect(
     </Dropdown>,
     <Badge key='schedule' count={job.appointments_aggregate.aggregate.count}>
       <Button
-        //TODO: Enabled logic based on status.
+        //TODO Enabled logic based on status.
         onClick={() => {
           setscheduleModalVisible(true);
         }}>
diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
index ba7e46422..0d8a869b7 100644
--- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
@@ -33,7 +33,7 @@ export default function NoteUpsertModalContainer({
     insertNote({
       variables: {
         noteInput: [
-          { ...noteState, jobid: jobId, created_by: "patrick@bodyshop.app" } //TODO: Fix the created by.
+          { ...noteState, jobid: jobId, created_by: "patrick@bodyshop.app" } //TODO Fix the created by.
         ]
       }
     }).then(r => {
diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
index a58168463..375e78d4a 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -27,7 +27,7 @@ function OwnerDetailFormContainer({ form, owner, refetch }) {
           notification["success"]({
             message: t("owners.successes.save")
           });
-          //TODO: Better way to reset the field decorators?
+          //TODO Better way to reset the field decorators?
           if (refetch) refetch().then();
           form.resetFields();
         });
diff --git a/client/src/components/schedule-appointment-modal/schedule-appointment-modal.component.jsx b/client/src/components/schedule-appointment-modal/schedule-appointment-modal.component.jsx
index 756ab4fba..a4825e363 100644
--- a/client/src/components/schedule-appointment-modal/schedule-appointment-modal.component.jsx
+++ b/client/src/components/schedule-appointment-modal/schedule-appointment-modal.component.jsx
@@ -11,7 +11,7 @@ export default function ScheduleJobModalComponent({
   ...props
 }) {
   const { t } = useTranslation();
-  //TODO: Existing appointments list only refreshes sometimes after modal close. May have to do with the container class.
+  //TODO Existing appointments list only refreshes sometimes after modal close. May have to do with the container class.
   return (
     <Modal
       {...props}
@@ -47,7 +47,7 @@ export default function ScheduleJobModalComponent({
           </Row>
 
           {
-            //TODO: Build out notifications.
+            //TODO Build out notifications.
           }
           <Checkbox
             defaultChecked={formData.notifyCustomer}
diff --git a/client/src/components/schedule-appointment-modal/schedule-appointment-modal.container.jsx b/client/src/components/schedule-appointment-modal/schedule-appointment-modal.container.jsx
index e2ca97995..c82299afc 100644
--- a/client/src/components/schedule-appointment-modal/schedule-appointment-modal.container.jsx
+++ b/client/src/components/schedule-appointment-modal/schedule-appointment-modal.container.jsx
@@ -43,7 +43,7 @@ export default connect(
       visible={scheduleModalVisible}
       onCancel={() => setscheduleModalVisible(false)}
       onOk={() => {
-        //TODO: Customize the amount of minutes it will add.
+        //TODO Customize the amount of minutes it will add.
         insertAppointment({
           variables: {
             app: { ...appData, end: moment(appData.start).add(60, "minutes") }
@@ -55,7 +55,7 @@ export default connect(
             });
 
             if (formData.notifyCustomer) {
-              //TODO: Implement customer reminder on scheduling.
+              //TODO Implement customer reminder on scheduling.
               alert("Chosed to notify the customer somehow!");
             }
             setscheduleModalVisible(false);
diff --git a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
index 82bc81ffc..a1f4f3428 100644
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -19,7 +19,7 @@ export default function ScheduleCalendarWrapperComponent({
       step={30}
       showMultiDayTimes
       localizer={localizer}
-      min={new Date("2020-01-01T06:00:00")} //TODO: Read from business settings.
+      min={new Date("2020-01-01T06:00:00")} //TODO Read from business settings.
       max={new Date("2020-01-01T20:00:00")}
       components={{
         event: e => {
diff --git a/client/src/components/schedule-event/schedule-event.component.jsx b/client/src/components/schedule-event/schedule-event.component.jsx
index 17cbb8b39..6866dbf10 100644
--- a/client/src/components/schedule-event/schedule-event.component.jsx
+++ b/client/src/components/schedule-event/schedule-event.component.jsx
@@ -61,14 +61,14 @@ export default function ScheduleEventComponent({ event, handleCancel }) {
       </Button>
       <Button>
         {
-          //TODO: Add reschedule Func.
+          //TODO Add reschedule Func.
         }
         {t("appointments.actions.reschedule")}
       </Button>
       {event.isintake ? (
         <Button>
           {
-            //TODO: Add intake func.
+            //TODO Add intake func.
           }
           {t("appointments.actions.intake")}
         </Button>
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 0cb4633e6..a32e82f30 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -13,7 +13,7 @@ export default function ScheduleJobModalComponent({
   ...props
 }) {
   const { t } = useTranslation();
-  //TODO: Existing appointments list only refreshes sometimes after modal close. May have to do with the container class.
+  //TODO Existing appointments list only refreshes sometimes after modal close. May have to do with the container class.
   return (
     <Modal
       {...props}
@@ -52,7 +52,7 @@ export default function ScheduleJobModalComponent({
             existingAppointments={existingAppointments}
           />
           {
-            //TODO: Build out notifications.
+            //TODO Build out notifications.
           }
           <Checkbox
             defaultChecked={formData.notifyCustomer}
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
index 4729e17dc..ac06b1b49 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -60,7 +60,7 @@ export default connect(
       visible={scheduleModalVisible}
       onCancel={() => setscheduleModalVisible(false)}
       onOk={() => {
-        //TODO: Customize the amount of minutes it will add.
+        //TODO Customize the amount of minutes it will add.
         insertAppointment({
           variables: {
             app: { ...appData, end: moment(appData.start).add(60, "minutes") }
@@ -73,7 +73,7 @@ export default connect(
               });
 
               if (formData.notifyCustomer) {
-                //TODO: Implement customer reminder on scheduling.
+                //TODO Implement customer reminder on scheduling.
                 alert("Chosed to notify the customer somehow!");
               }
               setscheduleModalVisible(false);
diff --git a/client/src/components/shop-employees/shop-employees.container.jsx b/client/src/components/shop-employees/shop-employees.container.jsx
index 1d86e835f..fc65e05cb 100644
--- a/client/src/components/shop-employees/shop-employees.container.jsx
+++ b/client/src/components/shop-employees/shop-employees.container.jsx
@@ -30,7 +30,7 @@ function ShopEmployeesContainer({ form, bodyshop }) {
         notification["success"]({
           message: t("employees.successes.delete")
         });
-        //TODO: Better way to reset the field decorators?
+        //TODO Better way to reset the field decorators?
         employeeState[1](null);
         refetch().then(r => form.resetFields());
       })
@@ -61,7 +61,7 @@ function ShopEmployeesContainer({ form, bodyshop }) {
               notification["success"]({
                 message: t("employees.successes.save")
               });
-              //TODO: Better way to reset the field decorators?
+              //TODO Better way to reset the field decorators?
               employeeState[1](null);
               refetch().then(r => form.resetFields());
             })
@@ -78,7 +78,7 @@ function ShopEmployeesContainer({ form, bodyshop }) {
             notification["success"]({
               message: t("employees.successes.save")
             });
-            //TODO: Better way to reset the field decorators?
+            //TODO Better way to reset the field decorators?
             employeeState[1](null);
             refetch()
               .then(r => form.resetFields())
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
index d5ccacd26..ec0a7fb70 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -26,7 +26,7 @@ function VehicleDetailFormContainer({ form, vehicle, refetch }) {
           notification["success"]({
             message: t("vehicles.successes.save")
           });
-          //TODO: Better way to reset the field decorators?
+          //TODO Better way to reset the field decorators?
           if (refetch) refetch().then();
           form.resetFields();
         });
diff --git a/client/src/components/vendors-form/vendors-form.container.jsx b/client/src/components/vendors-form/vendors-form.container.jsx
index 05ad0ee5d..04a034dcc 100644
--- a/client/src/components/vendors-form/vendors-form.container.jsx
+++ b/client/src/components/vendors-form/vendors-form.container.jsx
@@ -35,7 +35,7 @@ function VendorsFormContainer({ form, vendorId, refetch, bodyshop }) {
         notification["success"]({
           message: t("vendors.successes.deleted")
         });
-        //TODO: Better way to reset the field decorators?
+        //TODO Better way to reset the field decorators?
         if (refetch) refetch().then(r => form.resetFields());
       })
       .catch(error => {
@@ -66,7 +66,7 @@ function VendorsFormContainer({ form, vendorId, refetch, bodyshop }) {
               notification["success"]({
                 message: t("vendors.successes.saved")
               });
-              //TODO: Better way to reset the field decorators?
+              //TODO Better way to reset the field decorators?
               if (refetch) refetch().then(r => form.resetFields());
             })
             .catch(error => {
@@ -83,7 +83,7 @@ function VendorsFormContainer({ form, vendorId, refetch, bodyshop }) {
               notification["success"]({
                 message: t("vendors.successes.saved")
               });
-              //TODO: Better way to reset the field decorators?
+              //TODO Better way to reset the field decorators?
               if (refetch) refetch().then(r => form.resetFields());
             })
             .catch(error => {
diff --git a/client/src/pages/jobs-available/jobs-available.page.component.jsx b/client/src/pages/jobs-available/jobs-available.page.component.jsx
index b239bd1d3..79fcd8c1b 100644
--- a/client/src/pages/jobs-available/jobs-available.page.component.jsx
+++ b/client/src/pages/jobs-available/jobs-available.page.component.jsx
@@ -13,7 +13,7 @@ export default function JobsAvailablePageComponent({
         deleteJob={deleteJob}
         estDataLazyLoad={estDataLazyLoad}
       />
-      Available Supplements (//TODO: LOGIC HAS NOT YET BEEN COPIED FROM OTHER COMPONENT)
+      Available Supplements (//TODO LOGIC HAS NOT YET BEEN COPIED FROM OTHER COMPONENT)
       <JobsAvailableSupplementContainer
         deleteJob={deleteJob}
         estDataLazyLoad={estDataLazyLoad}
diff --git a/client/src/pages/jobs/jobs.page.jsx b/client/src/pages/jobs/jobs.page.jsx
index 0befc896c..06afb59ca 100644
--- a/client/src/pages/jobs/jobs.page.jsx
+++ b/client/src/pages/jobs/jobs.page.jsx
@@ -6,7 +6,7 @@ import JobDetailCards from "../../components/job-detail-cards/job-detail-cards.c
 import JobsList from "../../components/jobs-list/jobs-list.component";
 import { QUERY_ALL_OPEN_JOBS } from "../../graphql/jobs.queries";
 
-//TODO: Implement pagination for this.
+//TODO Implement pagination for this.
 export default function JobsPage({ match, location }) {
   const { loading, error, data } = useQuery(QUERY_ALL_OPEN_JOBS, {
     fetchPolicy: "network-only"
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 1848dd3d8..e0f24767b 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -99,7 +99,7 @@ export function* updateUserDetails(userDetails) {
     yield put(updateUserDetailsSuccess(userDetails.payload));
   } catch (error) {
     //yield put(signOutFailure(error.message));
-    //TODO: error handling
+    //TODO error handling
   }
 }
 
diff --git a/firebase/functions/index.js b/firebase/functions/index.js
index 50cd1ede2..3583ca696 100644
--- a/firebase/functions/index.js
+++ b/firebase/functions/index.js
@@ -2,7 +2,7 @@ const functions = require("firebase-functions");
 const admin = require("firebase-admin");
 admin.initializeApp(functions.config().firebase);
 
-//Todo: Move this to an environment parameter.
+//TODO Move this to an environment parameter.
 const GRAPHQL_ENDPOINT = functions.config().auth.graphql_endpoint;
 const HASURA_SECRET_ADMIN_KEY = functions.config().auth.hasura_secret_admin_key;
 const UPSERT_USER = `