Cleaned up code, added Time class