Further tidying up lists