Some more cleanup.
CloudAnimator to separate file.