Refactoring renderer & cleanup monitoring