Refactored DateTimeUtils a bit