Remove comments
Split line in impl
Fix code format
Split line in client
Use local variable in server source
Remove using namespace
Fix include order