Normalize more efficiently