Refactor by Marcus, changed clientThread filename to ClientThread