Refactor hardcoded renderers