Reorganize Client prototpye functions