some more rendering cleanup