Finished sensor refactoring