Refactor the renderers to make the code much less hairy
Tidy up the code.
Tidy up the code.