Render refactor (with couple of fixes)

Not having variable declarations at the top of the class is a little unusual, no?