Minor adjustments(efficiency based).

Also improved consistency between Sensor and Controller code.