Variant refactor