Code clean up for ClienThread class