Refactor deal with date