Address the review comments in ch_arch_cloud_controller