refactored code and allowed default of clear weather