more weather code clean-up