Refactor working hours normalization