Cypher refactorings