Refactoring m2k