Tidying up spaces