Refactor expected_credit_date