code cleanup -> use iterators on client list