[MIN] minor refactoring