Simplify shape normalization