A bit of tidying up.