DateUtil refactoring