code cleanups
added Time struct