Cleaned up opengl shapes code.