graphing: more code motion and reorganization, just being a perfectionist