cleanup AbstractSensor
cleanup + refactoring