Harshit & Kiran | Refactoring CC Service client.