renderer2: refactoring