Tidying up some more.