Tidying some spaces