Add IsValidExpiryYear and format a bit the code