rename comment and use done channel for client exit