Refactoring & DateTimePicker