[MC] refactor