[MIN] minor refactorings