Refactor datepicker alert again (#35)