Some cleaning up.
In the process of refactoring again... want to add the ability to view hourly events.