Tidying up stuff.