cleanup + DateTime/DateTimeOffset isDate refactoring