Pulled latest code from Choorp's Dash Weather+: code clean up