Refactor Weather sensor