Refactor render all