PTIDSensors refactoring