tidying up batch rendering
small cleanups