better client name, removed comment header