refactor delivery date formatting