did some refactoring on the sensor privacy matrix section