More code cleanup
More code cleanup
Rename var
It is now safe to render multiple times