Working hours refactoring