Refactoring for the Reyes Renderer