More cleanup on rendering refactor