Refactor renderers and demos