[newclient]: Some minor refactoring