Refactor timesheet