Rename variables for clarity.
Align code with structure of cloud_remove.
Update idl test version.