ControlStructuresOptimizer: reorganized some code
ControlStructuresOptimizer: reorganized some code