Refactoring of GraphPaper