Unitfy the two client classes to have less duplicate code.