Cleaned up GL stuff