giza: refactor duplicates