Do some additional tidying up.