Refactored GestureSensor