cleaned up rendering