Mintor refactorings