Refactored timetracker