Refactor Clipper.