Refactoring the MTL