Cleanup of render stuff

Spout:
Signed-off-by: Jack Huey kitskub@gmail.com