Refactoring the Grapher