[VariationBundle] Improve code quality
Improve quality of most complex class/methods
Merge pull request #1404 from stloyd/feature/improve_quality

Improve code quality