Refactor some things
Fix some leftover refactoring mess
Remove a debug line
Start working on the Weather module