Probabilities refactoring (move to class)