Refactor report date handling