Date Picker - code cleanup