Refactor bitmap renderer (SVG / canvas to follow)