diff --git a/src/actions/index.js b/src/actions/index.js
index 9bccf0db..9cd0e823 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -90,19 +90,17 @@ const initialize = () => {
 function cleanupExpressionResponse(data) {
   const s = store.getState();
   const metadata = s.controls.currentCellSelectionMap;
-  let errorOccured = false;
-  const newcells = _.filter(data.data.cells, cell => {
-    const found = metadata[cell.cellname];
-    errorOccured = errorOccured || !found;
-    return found;
+  let errorFound = false;
+  data.data.cells = _.filter(data.data.cells, cell => {
+    if (!errorFound && !metadata[cell.cellname]) {
+      errorFound = true;
+      console.error(
+        "Warning: /expression REST API returned unexpected cell names -- discarding surprises."
+      );
+    }
+    return metadata[cell.cellname];
   });
 
-  if (errorOccured) {
-    console.error(
-      "Warning: /expression REST API returned unexpected cell names -- discarding surprises."
-    );
-    data.data.cells = newcells;
-  }
   return data;
 }
 
diff --git a/src/util/scaleLinear.js b/src/util/scaleLinear.js
index daff5ffe..15aab8b9 100644
--- a/src/util/scaleLinear.js
+++ b/src/util/scaleLinear.js
@@ -9,10 +9,10 @@
 // this is is equivalent to d3.scaleLinear().domain([0,1]).range([-1,1])
 
 export const scaleLinear = (domain, range) => {
-  const offsetD = domain[0];
+  const domainStart = domain[0];
   const scale = (range[1] - range[0]) / (domain[1] - domain[0]);
-  const offsetR = range[0];
-  return function(v) {
-    return (v - offsetD) * scale + offsetR;
+  const rangeStart = range[0];
+  return function(value) {
+    return (value - domainStart) * scale + rangeStart;
   };
 };