[MC] Refactor