Cleaned up main and Rendering- and GraphicContexts a bit