More refactoring
Pulled out renderers