Render refactor (with couple of fixes)

Don't need double parans here