Move membershipRenewalDate to own function