Refactor MClip