Refactor ClipFrame