Fix issue with night() on first run, minor style updates