Do a bit of tidying up.