Cleaned up OptiGraph code.