Tidying up loose ends