[Sensor] code cleanup
Merge pull request #363 from BernardXiong/master

[Sensor] code cleanup