Rearrange some of the private methods in circle client class.