Refactored ClipPack