IW: Tidying up.