Refactored cloud rendering