Code cleanup, nothing major. Added first pass at WeatherStatino code.