Nullable date generator
Refactoring