Refactor Cropper