Render refactor (with couple of fixes)

Oh, I see. Didn't notice the class name. :)