Tidy up of the sediment code