Minor set tidying