Updated Client.cpp/Driver.cpp per coding style