Clean up rendering of data