[mc] refactor