Make client.cpp even MORE modular