Better formatting of the clamping
Some changes