[MIN] some refactorings