VariantBuilder code review round 2 update