Refactoring to use MomentOfOrder