cleaned up weather class