Render refactor (with couple of fixes)

Looks like this getter is unnecessary / it should be a `default, set` property?