Refactor to focus on WebGL Renderer