Basic clean up of rendering functions.