[Sensor] code cleanup