SensorStatus cleanup
Somecleanup to comply with Daniel comment