Tidying up Contact Service