Update moment + refactoring