tidying up and adding clients