Fixes in weather project
Refactoring