[cloud-sync] - Refactor code.
[cloud-sync] - Refactor code.