Refactor record render to separate source