Clean up for pull request

* Use else statement for non day/time attributes
* Add/clarify comments
* Remove unused code