graphiti refactoring