Refactor use of Zhang and Vasconcelos to standardize with the rest of methods