Fixed moment refactoring