[VariationBundle] Improve code quality
Improve quality of most complex class/methods