Refactoring in Variant