Start refactoring to use new function normalize_date