cleaned up the rendering a little