Small weather cleanup

Some weather changes.
1) Added some spaces to make code easier to read.
2) Fallback values of sunrise/sunset are now in use.
3) Replaced bad variable names with good one.