Improve render()