Refactor MvNormalCanon