Finally got the mouse working in the render context
Some more minor formatting