update to findClient method, some refractoring