Pruning and shaping

Pruning and shaping