Changed date format
Refactoring