Refactored the dates file