refactored rapport-clone and weather module