diff --git a/src/extensions/scratch3_gdx_for/index.js b/src/extensions/scratch3_gdx_for/index.js
index be6b2812c..254a4ccc1 100644
--- a/src/extensions/scratch3_gdx_for/index.js
+++ b/src/extensions/scratch3_gdx_for/index.js
@@ -3,6 +3,7 @@ const BlockType = require('../../extension-support/block-type');
 const log = require('../../util/log');
 const Cast = require('../../util/cast');
 const formatMessage = require('format-message');
+const MathUtil = require('../../util/math-util');
 const BLE = require('../../io/ble');
 const godirect = require('@vernier/godirect/dist/godirect.min.umd.js');
 const ScratchLinkDeviceAdapter = require('./scratch-link-device-adapter');
@@ -52,8 +53,8 @@ class GdxFor {
         this._scratchLinkSocket = null;
 
         /**
-         * A godirect device
-         * @type {@vernier/goDirect device}
+         * An @vernier/godirect Device
+         * @type {Device}
          * @private
          */
         this._device = null;
@@ -65,21 +66,6 @@ class GdxFor {
          */
         this._extensionId = extensionId;
 
-        /**
-         * The most recently received value for each sensor.
-         * @type {Object.<string, number>}
-         * @private
-         */
-        this._sensors = {
-            force: 0,
-            accelerationX: 0,
-            accelerationY: 0,
-            accelerationZ: 0,
-            angularVelocityX: 0,
-            angularVelocityY: 0,
-            angularVelocityZ: 0
-        };
-
         this.disconnect = this.disconnect.bind(this);
         this._onConnect = this._onConnect.bind(this);
     }
@@ -154,6 +140,9 @@ class GdxFor {
     _startMeasurements () {
         this._device.sensors.forEach(sensor => {
             sensor.setEnabled(true);
+
+            // For now, clear the save sensor values. The unlimited saving
+            // will be fixed in a future @vernier/godirect release.
             sensor.on('value-changed', changedSensor => {
                 if (changedSensor.values.length > 1000) {
                     changedSensor.clear();
@@ -169,13 +158,7 @@ class GdxFor {
             let force = this._device.getSensor(1).value;
             // Normalize the force, which can be measured between -50 and 50 N,
             // to be a value between -100 and 100.
-            force = force * 2;
-            if (force > 100) {
-                return 100;
-            }
-            if (force < -100) {
-                return -100;
-            }
+            force = MathUtil.clamp(force * 2, -100, 100);
             return force;
         }
         return 0;
diff --git a/src/extensions/scratch3_gdx_for/scratch-link-device-adapter.js b/src/extensions/scratch3_gdx_for/scratch-link-device-adapter.js
index 33b5f2a02..a9a61d4ae 100644
--- a/src/extensions/scratch3_gdx_for/scratch-link-device-adapter.js
+++ b/src/extensions/scratch3_gdx_for/scratch-link-device-adapter.js
@@ -4,7 +4,7 @@ const Base64Util = require('../../util/base64-util');
  * Adapter class
  */
 class ScratchLinkDeviceAdapter {
-    constructor (scratchLinkSocket, { service, commandChar, responseChar }) {
+    constructor (scratchLinkSocket, {service, commandChar, responseChar}) {
         this.scratchLinkSocket = scratchLinkSocket;
 
         this._service = service;