Refactoring for time tracking