Refactoring mt