Refactor and sort the DateList