[VariationBundle] Improve code quality