refactoring env_sensors
more refactoring