Starting cleaning up graphics.cpp