Further refactoring in CMA-ES algorithm