Some more cleanups
Some more optimizations
Using consistent style
Some more consistent style
Some more fixes
Renderer is a graphics object