Multiple sensor support
Tidy up