Refactor buiding timesheet
Code cleanup/refactoring