cleaned up grapher