Code cosmetics: added weather class