Mixture Sigma refactoring