code clean up #1 (set-up)
removed weather