Cleaned up the date display logic.