[MYM] refactoring