more renderer refactoring