Refactoring around enhanced rendering.