Render refactor (with couple of fixes)

Nice cleanup!