Formatting updates and making callback work from CloudClient.