impr: crop;  refactorings