renderer: code cleanup, refs #688