Cleanup, compacting and optimization part.3.1 gl_draw