Refactor sensors and add better names