Cleaned up datepicker