Initial refactorings to Cypher type system