refactored rendering