Refactoring renderer