Refactoring
Add: Check for a correct date format