diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
index 6caa6cdbf..8a6dce2d3 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
@@ -1,24 +1,18 @@
 <template name="measurementTableHeaderRow">
     <div class="measurementTableHeaderRow">
-        {{ #if anyUnmarkedLesionsLeft}}
-        <div class="add js-setTool">
-            <svg>
-                <use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-ui-add></use>
-            </svg>
-        </div>
-        {{ /if }}
-        <div class="type">
-            {{measurementType.name}}
-        </div>
-        <div class="max {{ # if gt numberOfMeasurements maxNumMeasurements }}warning{{/if}}">
-        {{ #if maxNumMeasurements }}
-            <p class="maxNumMeasurements">
-                Max {{maxNumMeasurements}}
-            </p>
+        {{#if anyUnmarkedLesionsLeft}}
+            <div class="add js-setTool">
+                <svg>
+                    <use xlink:href=/packages/ohif_viewerbase/assets/icons.svg#icon-ui-add></use>
+                </svg>
+            </div>
         {{/if}}
+        <div class="type">{{measurementType.name}}</div>
+        <div class="max {{#if gt numberOfMeasurements maxNumMeasurements}}warning{{/if}}">
+            {{#if maxNumMeasurements}}
+                <p class="maxNumMeasurements">Max {{maxNumMeasurements}}</p>
+            {{/if}}
         </div>
-        <div class="numberOfMeasurements">
-            {{numberOfMeasurements}}
-        </div>
+        <div class="numberOfMeasurements">{{numberOfMeasurements}}</div>
     </div>
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
index 9c9f09de1..4330abd55 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
@@ -1,5 +1,6 @@
 import { Template } from 'meteor/templating';
 import { _ } from 'meteor/underscore';
+import { OHIF } from 'meteor/ohif:core';
 
 OHIF.measurements.getLocation = collection => {
     for (let i = 0; i < collection.length; i++) {
@@ -9,8 +10,6 @@ OHIF.measurements.getLocation = collection => {
     }
 };
 
-const getLocation = OHIF.measurements.getLocation;
-
 Template.measurementTableView.helpers({
     getNewMeasurementType(tool) {
         // TODO: Check Conformance criteria here.
@@ -57,7 +56,7 @@ Template.measurementTableView.helpers({
         return Object.keys(groupObject).map(key => ({
             measurementTypeId: measurementTypeId,
             measurementNumber: key,
-            location: getLocation(groupObject[key]),
+            location: OHIF.measurements.getLocation(groupObject[key]),
             responseStatus: false, // TODO: Get the latest timepoint and determine the response status
             entries: groupObject[key]
         }));
@@ -75,9 +74,9 @@ Template.measurementTableView.helpers({
         }
 
         // If this is a baseline, stop here since there are no new measurements to display
-        
+
         if (!current || current.timepointType === 'baseline') {
-            console.log('Skipping New Measurements section');
+            OHIF.log.info('Skipping New Measurements section');
             return;
         }
 
@@ -108,10 +107,10 @@ Template.measurementTableView.helpers({
             return {
                 measurementTypeId: measurementTypeId,
                 measurementNumber: key,
-                location: getLocation(groupObject[key]),
+                location: OHIF.measurements.getLocation(groupObject[key]),
                 responseStatus: false, // TODO: Get the latest timepoint and determine the response status
                 entries: groupObject[key]
             };
         });
     }
-});
\ No newline at end of file
+});