Clean up / Commenting on ClientV2