Refactoring + cloud sprites integration