More general tidying up