More refactoring on timesheet code.